Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Tate
fd752502a6 Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 am: 38a37f336f -s ours" into nyc-dev am: 36a1b38e89 
am: 84dd33d8e5

* commit '84dd33d8e54bf175fe4045999202cc92ef6fb948':
  Backport of backup transport whitelist

Change-Id: I1ed0336ab110d291d92df781beb4cac272c1bc63
 2016-05-26 00:51:20 +00:00
Stephan Linzner
701438fbf2 Merge "Un-deprecated Android mock testing APIs" into nyc-dev am: dac0708ea0 
am: 347d660ce2

* commit '347d660ce25e72835aefc794b584c07d32ae5264':
  Un-deprecated Android mock testing APIs

Change-Id: Ibf99d4b9812a92ff9dc24518540bbb7725c3c932
 2016-05-26 00:49:58 +00:00
Phil Weaver
67aeaf77a8 Merge "Merge "Improve accessibility window title behavior" into nyc-dev am: 7ab1a4d286 am: 062d24f9ec" into nyc-mr1-dev-plus-aosp 
am: 6ac8735d95

* commit '6ac8735d953100817ca8e3237075a974013d6b6d':

Change-Id: I96e48292822b5920a0a19a6e5086e2fcacc310c9
 2016-05-26 00:48:46 +00:00
Phil Weaver
1f68154716 Merge "Improve accessibility window title behavior" into nyc-dev am: 7ab1a4d286 am: 0a16a8d1d6 
am: f6a1e1fe05

* commit 'f6a1e1fe05885cfa2f5aebf9102bcac7daa4bcfa':
  Improve accessibility window title behavior

Change-Id: Icc64e6cfe827e93c5b5be11c8244e681c037d952
 2016-05-26 00:48:40 +00:00
Sid Soundararajan
7cb7a0aa60 Merge "Make content descriptions of task cards, the title description" into nyc-dev 2016-05-26 00:45:28 +00:00
Dianne Hackborn
dbcca24f8e Merge "Fix issue #28964589: Binding dies when (unrelated) component is disabled in package" into nyc-dev 2016-05-26 00:43:33 +00:00
Alan Viverette
8f0ab27570 Merge "Fix borderless colored button text color" into nyc-dev 2016-05-26 00:40:19 +00:00
Andrii Kulian
e2a0c9437c Merge "Fix exception when trying to update config of detached stack" into nyc-dev 
am: a1984286d3

* commit 'a1984286d397e4198d4e26572fb54cd55dce6d20':
  Fix exception when trying to update config of detached stack

Change-Id: Id7fca21dc2a23206e2b241f90ac1119cf5281e18
 2016-05-26 00:36:19 +00:00
Andrii Kulian
7c7de841d5 Merge "Fix exception when trying to update config of detached stack" into nyc-dev 
am: a1984286d3

* commit 'a1984286d397e4198d4e26572fb54cd55dce6d20':
  Fix exception when trying to update config of detached stack

Change-Id: I293ac1716f7c05677ce90e7cceaf8b094be3ca97
 2016-05-26 00:36:17 +00:00
Chris Tate
84dd33d8e5 Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 am: 38a37f336f -s ours" into nyc-dev 
am: 36a1b38e89

* commit '36a1b38e899687b217fe6e043022ed83fc37386b':
  Backport of backup transport whitelist

Change-Id: Iaac686d1ac503ab9799a1de1d10f8bb874d8199a
 2016-05-26 00:34:16 +00:00
Chris Tate
1964936fa8 Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 am: 38a37f336f -s ours" into nyc-dev 
am: 36a1b38e89

* commit '36a1b38e899687b217fe6e043022ed83fc37386b':
  Backport of backup transport whitelist

Change-Id: I69eec8b0c2558b00b319df0d5fa46784b08a5401
 2016-05-26 00:34:08 +00:00
Stephan Linzner
347d660ce2 Merge "Un-deprecated Android mock testing APIs" into nyc-dev 
am: dac0708ea0

* commit 'dac0708ea0efab696cd772ab346becbcc03232e6':
  Un-deprecated Android mock testing APIs

Change-Id: I21d0f3a65af94074ba477d4acaa20ff9686f9f5c
 2016-05-26 00:33:05 +00:00
Stephan Linzner
14ba2e78fd Merge "Un-deprecated Android mock testing APIs" into nyc-dev 
am: dac0708ea0

* commit 'dac0708ea0efab696cd772ab346becbcc03232e6':
  Un-deprecated Android mock testing APIs

Change-Id: I4a853b57b8cfbc834e43e050f26bc078c1b4e92c
 2016-05-26 00:32:51 +00:00
Roshan Pius
c6e050362f Merge "BatteryStats: Allow for sample errors in wlan stats" into nyc-dev am: 135c4760fd am: e42702d2f2 
am: 4759cd2ff4

* commit '4759cd2ff4bdddb9e42b6cb2c034dcf7c86ee748':

Change-Id: I6ef76e22e6c1a86beb7c5bb5fe829405624f1a5f
 2016-05-26 00:31:22 +00:00
Android Build Merger (Role)
6ac8735d95 Merge "Merge "Improve accessibility window title behavior" into nyc-dev am: 7ab1a4d286 am: 062d24f9ec" into nyc-mr1-dev-plus-aosp 2016-05-26 00:25:42 +00:00
Phil Weaver
324332caa4 Merge "Improve accessibility window title behavior" into nyc-dev am: 7ab1a4d286 
am: 062d24f9ec

* commit '062d24f9ecc1b7db7e5aa39460216f5f9f82ad09':
  Improve accessibility window title behavior

Change-Id: I0d239da8b74bb58b7434a94135e8d1198db85c7e
 2016-05-26 00:25:15 +00:00
Phil Weaver
f6a1e1fe05 Merge "Improve accessibility window title behavior" into nyc-dev am: 7ab1a4d286 
am: 0a16a8d1d6

* commit '0a16a8d1d6ee63519123857dc4f305c96de7198b':
  Improve accessibility window title behavior

Change-Id: I0b0f95fb78e342cd17a85c7077f6e13a44ed0045
 2016-05-26 00:24:59 +00:00
Andrii Kulian
a1984286d3 Merge "Fix exception when trying to update config of detached stack" into nyc-dev 2016-05-26 00:24:10 +00:00
Android Build Merger (Role)
36a1b38e89 Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 am: 38a37f336f -s ours" into nyc-dev 2016-05-26 00:24:01 +00:00
Chris Tate
dbda4c2f9a Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 
am: 38a37f336f  -s ours

* commit '38a37f336f96896146efc1a85310504bf4f77116':
  Backport of backup transport whitelist

Change-Id: I63c06c0bdfc8a8a254bdf81fce5a76b46c59bfd8
 2016-05-26 00:22:47 +00:00
TreeHugger Robot
dac0708ea0 Merge "Un-deprecated Android mock testing APIs" into nyc-dev 2016-05-26 00:22:29 +00:00
Phil Weaver
0a16a8d1d6 Merge "Improve accessibility window title behavior" into nyc-dev 
am: 7ab1a4d286

* commit '7ab1a4d286898acffd1f3b444f9efc9e1d2a104e':
  Improve accessibility window title behavior

Change-Id: Iff0d61871f48a66510e1fab72adbfb062c01c203
 2016-05-26 00:19:19 +00:00
Phil Weaver
062d24f9ec Merge "Improve accessibility window title behavior" into nyc-dev 
am: 7ab1a4d286

* commit '7ab1a4d286898acffd1f3b444f9efc9e1d2a104e':
  Improve accessibility window title behavior

Change-Id: I29286da845751351f3dcf603efb12441a6efe74e
 2016-05-26 00:18:34 +00:00
Roshan Pius
33481f57c3 Merge "Per API review, revert the API renaming CL." into nyc-dev am: 03d3f4a6cb am: 0f19009fb7 
am: a3c7531a48

* commit 'a3c7531a482aa115db6f8e648362d8d0b77d3524':
  BatteryStats: Allow for sample errors in wlan stats

Change-Id: I22e0312be38dde36b874c837d5835f392a8954a8
 2016-05-26 00:18:26 +00:00
Derek Tan
7f2a994d98 Merge "Merge "Per API review, revert the API renaming CL." into nyc-dev am: 03d3f4a6cb am: e214ff00ea" into nyc-mr1-dev-plus-aosp 
am: 4c0848d9c8

* commit '4c0848d9c80d25eee3c974b8e76fdabd01aa05b3':

Change-Id: Iaad8b76b54375424840484e2d0899148558c70d7
 2016-05-26 00:16:48 +00:00
Derek Tan
7d28bbd11b Merge "Per API review, revert the API renaming CL." into nyc-dev am: 03d3f4a6cb am: 869f32d810 
am: 9b8b72748c

* commit '9b8b72748c555329564577d53e96a600bf1ea99b':
  Per API review, revert the API renaming CL.

Change-Id: Id802ddda4cfd858366f6cb4206a9e1110feb5ad8
 2016-05-26 00:14:02 +00:00
Roshan Pius
4759cd2ff4 Merge "BatteryStats: Allow for sample errors in wlan stats" into nyc-dev am: 135c4760fd 
am: e42702d2f2

* commit 'e42702d2f299ddf24284c25946211606e804db93':

Change-Id: Iec0e86c87876785bf2304356a9cbe575b3994c54
 2016-05-26 00:14:00 +00:00
Christopher Tate
88c9eae886 DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade 
am: 24ceca96af  -s ours

* commit '24ceca96af925ac19a1fa337afc0e739d9cb11ad':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I1c79f9a012981dc2be9c8342674780c85bbf6663
 2016-05-26 00:12:37 +00:00
Phil Weaver
7ab1a4d286 Merge "Improve accessibility window title behavior" into nyc-dev 2016-05-26 00:11:25 +00:00
Sid Soundararajan
caa611f88d Make content descriptions of task cards, the title description 
Use the title description as content description for the task
card, this should be better for talkback.

BUG: 28594452
Change-Id: Idc97004f1370a35ea5328c4e9e46a72a9349c8f4
 2016-05-25 17:08:12 -07:00
Derek Tan
a3c7531a48 Merge "Per API review, revert the API renaming CL." into nyc-dev am: 03d3f4a6cb 
am: 0f19009fb7

* commit '0f19009fb7daa5e03c29f4c853e3798b4f38661e':
  BatteryStats: Allow for sample errors in wlan stats

Change-Id: I6e7becdf2427d847af56af3df959a61f5f31669e
 2016-05-26 00:07:28 +00:00
Android Build Merger (Role)
4c0848d9c8 Merge "Merge "Per API review, revert the API renaming CL." into nyc-dev am: 03d3f4a6cb am: e214ff00ea" into nyc-mr1-dev-plus-aosp 2016-05-26 00:04:17 +00:00
Derek Tan
329b0e5c14 Merge "Per API review, revert the API renaming CL." into nyc-dev am: 03d3f4a6cb 
am: e214ff00ea

* commit 'e214ff00eada0035ed0cae33856846be1c1158ec':
  Per API review, revert the API renaming CL.

Change-Id: I0510bff5c08c9000626da6ccf5188dc8a20a89c4
 2016-05-26 00:01:13 +00:00
Derek Tan
9b8b72748c Merge "Per API review, revert the API renaming CL." into nyc-dev am: 03d3f4a6cb 
am: 869f32d810

* commit '869f32d8101862b8c96ecb6cd7317acf0c655c38':
  Per API review, revert the API renaming CL.

Change-Id: I8017702c808b84c8f05dd51ba8c8c0afda8a6b9f
 2016-05-26 00:00:49 +00:00
Roshan Pius
e42702d2f2 Merge "BatteryStats: Allow for sample errors in wlan stats" into nyc-dev 
am: 135c4760fd

* commit '135c4760fddc7809ea5f7e9d58bc3f4b3a076875':
  BatteryStats: Allow for sample errors in wlan stats

Change-Id: Ia7440d790dfe6f1c1e9d7c564cd9cc4f9df6342d
 2016-05-25 23:59:47 +00:00
Roshan Pius
0f19009fb7 Merge "BatteryStats: Allow for sample errors in wlan stats" into nyc-dev 
am: 135c4760fd

* commit '135c4760fddc7809ea5f7e9d58bc3f4b3a076875':
  BatteryStats: Allow for sample errors in wlan stats

Change-Id: I23e117ccaa78cb7e6a3a0b9df682ec459391fb34
 2016-05-25 23:57:56 +00:00
TreeHugger Robot
135c4760fd Merge "BatteryStats: Allow for sample errors in wlan stats" into nyc-dev 2016-05-25 23:51:01 +00:00
Derek Tan
869f32d810 Merge "Per API review, revert the API renaming CL." into nyc-dev 
am: 03d3f4a6cb

* commit '03d3f4a6cb2c2d7b92e5cff09e5e7daefba398e9':
  Per API review, revert the API renaming CL.

Change-Id: Ic5fb3154e837742622e27fbc2d68eb19930a2faf
 2016-05-25 23:50:45 +00:00
Derek Tan
e214ff00ea Merge "Per API review, revert the API renaming CL." into nyc-dev 
am: 03d3f4a6cb

* commit '03d3f4a6cb2c2d7b92e5cff09e5e7daefba398e9':
  Per API review, revert the API renaming CL.

Change-Id: I536acb34c3d4b531db777a0635ccdb173db1183d
 2016-05-25 23:50:12 +00:00
Adam Lesinski
27d301667b Use app's best locale if they override LocaleList 
App's can technically override their configuration's Locale,
which means we must choose the overriden locale as the best,
and therefore set the LocaleList.setDefault() with that locale.

Bug:28953437
Change-Id: I4b301fcd6bc426e37bb389d3a6f2b4a3c69ac33a
 2016-05-25 16:45:14 -07:00
Adam Powell
43ec62af45 N is API 24 
Change-Id: Ifea71ccff96c3c70f9f3e60ecdcb2b56af82bb08
 2016-05-25 16:42:56 -07:00
Derek Tan
03d3f4a6cb Merge "Per API review, revert the API renaming CL." into nyc-dev 2016-05-25 23:41:21 +00:00
Philip P. Moltmann
6a5a055941 Merge "Merge "Move add-printer list headers to the right positions." into nyc-dev am: 00e3c23265 am: 3f0c4ca281" into nyc-mr1-dev-plus-aosp 
am: 7cd37f89ef

* commit '7cd37f89efec1d9532bc056dca4f5981ab87a0a2':

Change-Id: I1741d9112f8876263f1f4c8ef49fdb2cf2f39270
 2016-05-25 23:41:09 +00:00
Philip P. Moltmann
9a47e6fdb8 Merge "Move add-printer list headers to the right positions." into nyc-dev am: 00e3c23265 am: 5338bead7f 
am: eee4b73f8a

* commit 'eee4b73f8acaa392010a90285a1c4a95eaf9f9db':
  Move add-printer list headers to the right positions.

Change-Id: I3a0960958f504700906ced3a65371e96affd7894
 2016-05-25 23:41:02 +00:00
Android Build Merger (Role)
7cd37f89ef Merge "Merge "Move add-printer list headers to the right positions." into nyc-dev am: 00e3c23265 am: 3f0c4ca281" into nyc-mr1-dev-plus-aosp 2016-05-25 23:31:58 +00:00
Philip P. Moltmann
dc0e3054c3 Merge "Move add-printer list headers to the right positions." into nyc-dev am: 00e3c23265 
am: 3f0c4ca281

* commit '3f0c4ca2810d875b0d503214165d9bc1e8948a14':
  Move add-printer list headers to the right positions.

Change-Id: I35d9528693507680474f62a3d4339f048ded1ac0
 2016-05-25 23:31:32 +00:00
Philip P. Moltmann
eee4b73f8a Merge "Move add-printer list headers to the right positions." into nyc-dev am: 00e3c23265 
am: 5338bead7f

* commit '5338bead7fae9113048bfbb99d7a3ef4a9c2b153':
  Move add-printer list headers to the right positions.

Change-Id: I638a6c7282d5c47ca746034c1fb42500bc8050b7
 2016-05-25 23:31:23 +00:00
TreeHugger Robot
6794f29312 Merge "Annotate TetherInterfaceStateMachineTest for APCT" 2016-05-25 23:26:09 +00:00
Hemal Patel
ff9f9ee180 Docs: Changed GitHub samples link to point to "Google Samples" page on 
GitHub.

Bug: 28223672
Change-Id: Ie168740a3f9c8393379d09bb97c7f6422d8fb9dd
 2016-05-25 16:25:32 -07:00
Philip P. Moltmann
3f0c4ca281 Merge "Move add-printer list headers to the right positions." into nyc-dev 
am: 00e3c23265

* commit '00e3c232656e648376c94a78b568c3ca1fe8c123':
  Move add-printer list headers to the right positions.

Change-Id: I43e2a7a548bbb21223f1007c03c57a00aa966402
 2016-05-25 23:22:24 +00:00