Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,895 Commits 3 Branches 0 Tags
87f3aeeee2a9859cd312c3f1d8a18946cf8f582b
Commit Graph

256895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
902c693bae Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb8c569414 -s ours am: 8272bb6af4 -s ours" into nyc-mr1-dev-plus-aosp 2016-05-27 03:29:00 +00:00
Dan Sandler
2aa9e127cd Merge "Merge "Time to #NameAndroidN!" into nyc-dev am: 45caebe035" into nyc-mr1-dev 
am: a474cf8a90

* commit 'a474cf8a902b111aba52318fe16d258aefae13fe':
  Fixing crash in SysUI due to invalid group.

Change-Id: Id5c87e72274a5083c2cf8625ee366ed46dd9859f
 2016-05-27 03:28:57 +00:00
Jeff Sharkey
977450135c Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am: d6ee899397" into nyc-mr1-dev 
am: 56f7a36c46

* commit '56f7a36c46678f596f870fbef41252eedc812150':
  Time to #NameAndroidN!

Change-Id: Iec0ae063378200965d8a153308afac4edcfc9a8d
 2016-05-27 03:28:50 +00:00
Tenghui Zhu
4bde3fdcb1 Merge "Update the light center when the root view\'s layout changed" into nyc-dev am: e78ba24c17 
am: b076ee0a42

* commit 'b076ee0a4290bc12c7eb1f959551c62448d74a81':

Change-Id: I871f9e75d10775e7851e81ac55b45e227f1858fa
 2016-05-27 03:28:23 +00:00
sreevanis
88c6e6da0a Merge "Updated link to material design page. am: ff05383baf am: ee44b14cd4" into nyc-dev 
am: 3106e71ddc

* commit '3106e71ddc6ace7bc15b50e4a91ed98ed428bee2':
  Updated link to material design page.

Change-Id: Ifc6c2b1460ed0006cc83a531f41342e4a67419ef
 2016-05-27 03:28:20 +00:00
John Reck
fa33b23ee8 Merge "Change overdraw test to use windowbackground" into nyc-dev 
am: 34979a3af6

* commit '34979a3af6dbb6e3e33a83e5cb939ea3c8c000c7':
  Change overdraw test to use windowbackground

Change-Id: I33e81c72d55fb03cf40dfe173b4b14ffab09f880
 2016-05-27 03:28:09 +00:00
Kevin Hufnagle
302e608b73 Merge "resolve merge conflicts of 7f7eec3 to nyc-dev" into nyc-dev 
am: 8d063a396f

* commit '8d063a396fbce3fae74c423a181a36272ee91231':
  Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.

Change-Id: I5459f1583202ccf9567e67382a1098f3a92fc0fd
 2016-05-27 03:27:58 +00:00
Selim Cinek
828d701667 Merge "Fixed the relative time spoken with accessibility" into nyc-dev 
am: 38b5946fae

* commit '38b5946fae50d4e9e8f32c985983d03a4437910d':
  Fixed the relative time spoken with accessibility

Change-Id: I51bbe71d2b86cfb8f050882b072092a015573fdb
 2016-05-27 03:27:43 +00:00
Phil Burk
38e317ede8 Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am: d34d06606d 
am: 4eccbbf926

* commit '4eccbbf9265a1134d870ff65ea9f7f798329bfd0':

Change-Id: Ic9a7c0b7b411ca19f09aaf2a9fa183acec5f0786
 2016-05-27 03:27:33 +00:00
Christopher Tate
d61bd47a0d Merge "Use backstop timeouts on asynchronous countdown during preflight" into nyc-dev 
am: 210f2ff198

* commit '210f2ff19808ce6b261a84596bf141909ecb381c':
  Use backstop timeouts on asynchronous countdown during preflight

Change-Id: Id282e332a226ca4c9c2f38aef4c1f24e3003321b
 2016-05-27 03:27:29 +00:00
Manoja Wijewardene
34c7d824bc Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev am: 1ad12e0678 
am: 5ce70998d0

* commit '5ce70998d014bdf3a819d3b0512925bebf9afb2c':

Change-Id: I5bd1b0ce031a34249274746e4b584c2becfde313
 2016-05-27 03:25:24 +00:00
Bill Yi
a308faaa66 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9aed8c2fa0 -s ours 
am: 9f2ffbcd66  -s ours

* commit '9f2ffbcd6674928818775002f15a1661d322aef1':

Change-Id: Idaf84d41a7aac1ed04b0abf97ca0449b53afaf89
 2016-05-27 03:24:34 +00:00
Jorim Jaggi
ff0298540b Fix toast with accessibility and app pinning 
am: cf984c56ad

* commit 'cf984c56adf88ab9d85b9a6ca71d800c2a937e6c':
  Fix toast with accessibility and app pinning

Change-Id: I0c1ed9d86d6f372227a12b8f5de7f4ab0b9fd37a
 2016-05-27 03:24:20 +00:00
Jeff Sharkey
d948e39e94 Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am: d6ee899397" into nyc-mr1-dev 
am: 4e8b6bfe69

* commit '4e8b6bfe69c8dcd8706743f04f412848b9e2e345':
  Delay PACKAGE_RESTARTED until after data cleared.

Change-Id: I9624930d2a00c3dac197c67d613fa7d578826035
 2016-05-27 03:24:09 +00:00
George Mount
8453136b8e Merge "Fix Activity Transition mess-up." into nyc-dev 
am: bd34103c5d

* commit 'bd34103c5defbfd180be6a387eb5aa82d4b97eac':
  Fix Activity Transition mess-up.

Change-Id: I62457d504583e1865ceeace2918d81b4ef223b12
 2016-05-27 03:24:06 +00:00
Jeff Sharkey
a822d4e73a Merge "Merge "Careful process validation for unaware providers." into nyc-dev am: 678dba737b" into nyc-mr1-dev 
am: 37b78dcdd7

* commit '37b78dcdd7790b758f9031976c7ca615de383c69':
  Careful process validation for unaware providers.

Change-Id: Ibe3cafb6a31be30df823870e3f39dd1e31dfa75a
 2016-05-27 03:24:03 +00:00
Winson
99a36a841a Merge "Defer calling the stack task removed callbacks. am: 6c8217ab30" into nyc-mr1-dev 
am: e351f281ef

* commit 'e351f281efcf9fe30d3a39f2b471f68f2ac2a273':
  Defer calling the stack task removed callbacks.

Change-Id: I1addad7ea298ad0257a5df0a4304850543ee63d1
 2016-05-27 03:23:55 +00:00
Wyatt Riley
4e6cd80198 Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev 
am: 793ac34219

* commit '793ac342196c57f6b89ad9d1425fc420fbb44bb5':
  Prevent use of a null sCallbackObj by Hardware FLP

Change-Id: I3681a3433f21112659840fb4431f0f616305ee3c
 2016-05-27 03:23:44 +00:00
Jeff Sharkey
68f4e9fbb2 Merge changes from topic \'am-e4ceb878ab564c70a4e1726ee7c0709a\' into nyc-mr1-dev 
am: 0ce1648f01

* commit '0ce1648f016e96cd7a496753b86d16f78795930a':
  Suppress unlock notifications on non-FBE devices.
  Replace caribou wallpaper without the stars b/28339724

Change-Id: I05bc48ae343e57be43e88dafc538a3dfe77ff37a
 2016-05-27 03:23:40 +00:00
Bill Yi
baa7989dc2 Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb8c569414 -s ours 
am: 8272bb6af4  -s ours

* commit '8272bb6af49a6ce8803e54c92fe63a095bb23a24':

Change-Id: I676d3e4ac37db3b933d775e6b886c9cc5a38c8d2
 2016-05-27 03:23:14 +00:00
Eric Schmidt
eacf998c56 Merge "Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am: 8e08dbe8f8 am: 400aed3556 am: 28bdf2907a" into nyc-mr1-dev 
am: b5cb2ff00a

* commit 'b5cb2ff00a119870875b8f0aa2e9fd0fa49f1890':
  docs: Removing CLI steps in getting started docs

Change-Id: I82373e48cac77b840c4330b37aeb10bda0da860d
 2016-05-27 03:23:08 +00:00
Alan Viverette
d93090d916 Merge "Prevent callbacks during DrawableContainer child initialization" into nyc-dev 
am: 0f1ae5fa0f

* commit '0f1ae5fa0f405bc3ec040fe512f7fad86577ce9f':
  Prevent callbacks during DrawableContainer child initialization

Change-Id: Ica1a228184231c5d33564968605e0a0e21a1dd0b
 2016-05-27 03:22:53 +00:00
Winson
a474cf8a90 Merge "Fixing crash in SysUI due to invalid group." into nyc-dev 
am: 814358a24f

* commit '814358a24f7bf045cdd8261f15aefff59936287b':
  Fixing crash in SysUI due to invalid group.

Change-Id: Ib194b1041b5931483857ee57c0573277e942ec31
 2016-05-27 03:22:01 +00:00
Christine Hallstrom
fa72d4caff Merge "Properly check if BT is off when shutting down radios" into nyc-mr1-dev 
am: 0f760e0815

* commit '0f760e081570cb7fe3ac7dd6a86125a8f79e5b34':
  Properly check if BT is off when shutting down radios

Change-Id: I7d3b2d40664115555db897b46b3debc5b2c04f8d
 2016-05-27 03:16:59 +00:00
Julia Reynolds
60453d14ad Merge "Unlocked access of mServices is bad." into nyc-dev am: d9599faf6b 
am: c2813e2501

* commit 'c2813e2501b9807e3e497b73ce0de11d7c502ef5':
  Unlocked access of mServices is bad.

Change-Id: Ida62aad8608081cc74b9a1ab6b7a125af637ea65
 2016-05-27 03:16:55 +00:00
Julia Reynolds
df5072d152 Merge "Reset slider animator on density change" into nyc-dev am: d52a81eeae 
am: 0e64814c7d

* commit '0e64814c7d954083d93102a645a9b44239a50408':
  Reset slider animator on density change

Change-Id: I8d59a243c67a35133430cb378d76413ce6d176c1
 2016-05-27 03:14:51 +00:00
Fyodor Kupolov
f6816ad3c5 Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev am: a4dbdaf5e9 
am: 5d531e4f6c

* commit '5d531e4f6caedbcc2b6a9c7a549b83e37d694c7d':
  Remove ActivityManager calls with PM.mInstallLock held

Change-Id: I17c8e62b0c65afe3fe58490d8e5634d9442e6821
 2016-05-27 03:14:39 +00:00
smain@google.com
38466617c1 add redirect for Espresso Test Recorder doc that will soon be on TAC site. am: 8f60544180 am: e1bd7e15c5 am: 5d3ca78d3f 
am: b35e6f9ad7

* commit 'b35e6f9ad7ddfc88bb9897746447f685304edb99':
  add redirect for Espresso Test Recorder doc that will soon be on TAC site.

Change-Id: I460a9ee98f98c13f054f63b40ab39bf7d9422988
 2016-05-27 03:14:30 +00:00
Paul Jensen
257c5b2e9c Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3 am: 7ff57eaff9 am: 94c8855da6 am: 50615e498e 
am: fdc53e96d3

* commit 'fdc53e96d3e99f4b5b5a9406e1c59b5e32bfc96c':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I75e1b139492cac12bf73fa68894f2e7ae7deb701
 2016-05-27 03:14:22 +00:00
Android Build Merger (Role)
56f7a36c46 Merge "Merge "Time to #NameAndroidN!" into nyc-dev am: 45caebe035" into nyc-mr1-dev 2016-05-27 03:14:19 +00:00
Android Build Merger (Role)
4e8b6bfe69 Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am: d6ee899397" into nyc-mr1-dev 2016-05-27 03:14:10 +00:00
Christopher Tate
4f34e793b3 DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af -s ours am: 88c9eae886 am: 1fa817c057 am: 040cf14047 am: 0905c8f398 -s ours am: d39c0a8d77 
am: 50aa0324c9

* commit '50aa0324c9f425b83b4ca241fb8727033f026532':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I380d5828e9b8b8860d59d2ea9077b368f1c82d55
 2016-05-27 03:14:07 +00:00
Android Build Merger (Role)
37b78dcdd7 Merge "Merge "Careful process validation for unaware providers." into nyc-dev am: 678dba737b" into nyc-mr1-dev 2016-05-27 03:14:03 +00:00
Android Build Merger (Role)
e351f281ef Merge "Defer calling the stack task removed callbacks. am: 6c8217ab30" into nyc-mr1-dev 2016-05-27 03:13:56 +00:00
Android Build Merger (Role)
0ce1648f01 Merge changes from topic 'am-e4ceb878ab564c70a4e1726ee7c0709a' into nyc-mr1-dev 
* changes:
  Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev am: a39d888651
  Merge "Replace caribou wallpaper without the stars b/28339724" into nyc-dev am: b3d4ad2205
 2016-05-27 03:13:47 +00:00
Android Build Merger (Role)
b5cb2ff00a Merge "Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am: 8e08dbe8f8 am: 400aed3556 am: 28bdf2907a" into nyc-mr1-dev 2016-05-27 03:13:32 +00:00
Dan Sandler
f64660d551 Merge "Time to #NameAndroidN!" into nyc-dev 
am: 45caebe035

* commit '45caebe035a67db18d06c4f4e4f124246fb5321d':
  Time to #NameAndroidN!

Change-Id: Iecedefbae64d4a6ffb67971be0f9da5eb746b1ed
 2016-05-27 03:12:50 +00:00
Jeff Sharkey
4e79d8b235 Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev 
am: d6ee899397

* commit 'd6ee8993973050befff3a5f10f273ef9e8a050e2':
  Delay PACKAGE_RESTARTED until after data cleared.

Change-Id: I8bb3f31a6de42da81a44c9aaf121769ed96b6a3b
 2016-05-27 03:12:31 +00:00
Jeff Sharkey
27deabaf61 Merge "Careful process validation for unaware providers." into nyc-dev 
am: 678dba737b

* commit '678dba737bed94eb5eeeed63db74aa811ee896cb':
  Careful process validation for unaware providers.

Change-Id: I7856be9d44587869ee73533072aaf26d8a7908ab
 2016-05-27 03:12:15 +00:00
Winson
1713d40af9 Defer calling the stack task removed callbacks. 
am: 6c8217ab30

* commit '6c8217ab3072fa65851316a922b482506b3c2a4c':
  Defer calling the stack task removed callbacks.

Change-Id: Icf53cc0628c98293b3a2d4ab28d95e54ee93f248
 2016-05-27 03:11:47 +00:00
Jeff Sharkey
e9baebb268 Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev 
am: a39d888651

* commit 'a39d888651493d20f3814cd88a39a521450b3eac':
  Suppress unlock notifications on non-FBE devices.

Change-Id: I9e17a23b0f3127ac5ae0f08cbf0a6c306aaba9d5
 2016-05-27 03:11:06 +00:00
Hyunyoung Song
49d1590d9a Merge "Replace caribou wallpaper without the stars b/28339724" into nyc-dev 
am: b3d4ad2205

* commit 'b3d4ad220598beffb30ac4cd44741ff19da2c57a':
  Replace caribou wallpaper without the stars b/28339724

Change-Id: I8062526bf7ba313e924621cf6a16ceb738e72d72
 2016-05-27 03:08:58 +00:00
TreeHugger Robot
0f760e0815 Merge "Properly check if BT is off when shutting down radios" into nyc-mr1-dev 2016-05-27 03:08:38 +00:00
Eric Schmidt
9cea0f9a71 Merge "docs: Removing CLI steps in getting started docs" into mnc-io-docs am: 8e08dbe8f8 am: 400aed3556 
am: 28bdf2907a

* commit '28bdf2907aa5448f455475fde399870c22c4180a':
  docs: Removing CLI steps in getting started docs

Change-Id: Iaf0135b79c79cb299055096091bc1519527ab1b7
 2016-05-27 03:08:38 +00:00
Julia Reynolds
c2813e2501 Merge "Unlocked access of mServices is bad." into nyc-dev 
am: d9599faf6b

* commit 'd9599faf6b872fb5e1db72f7239b21d05050bd47':
  Unlocked access of mServices is bad.

Change-Id: I84a2e07aa57e5e25ac1190b4dbfa4005c6d1e572
 2016-05-27 03:06:10 +00:00
Julia Reynolds
0e64814c7d Merge "Reset slider animator on density change" into nyc-dev 
am: d52a81eeae

* commit 'd52a81eeae2b9b8425a75ee8906ed7b94b5c471a':
  Reset slider animator on density change

Change-Id: I75012bd5af8ae07e5917fbffbc18cf1120e09ebc
 2016-05-27 03:05:42 +00:00
Fyodor Kupolov
5d531e4f6c Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev 
am: a4dbdaf5e9

* commit 'a4dbdaf5e96273dccd474e31700d84a1ad907503':
  Remove ActivityManager calls with PM.mInstallLock held

Change-Id: I3be800fc5de9fa3c06f0bf6158a0dbf2a05b165e
 2016-05-27 03:05:20 +00:00
smain@google.com
b35e6f9ad7 add redirect for Espresso Test Recorder doc that will soon be on TAC site. am: 8f60544180 am: e1bd7e15c5 
am: 5d3ca78d3f

* commit '5d3ca78d3f561e98ae67cf97caa58a4e9e2ed5cd':
  add redirect for Espresso Test Recorder doc that will soon be on TAC site.

Change-Id: I339dffae3b9532699c558d406b03a32dabae6517
 2016-05-27 03:05:00 +00:00
Paul Jensen
fdc53e96d3 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3 am: 7ff57eaff9 am: 94c8855da6 
am: 50615e498e

* commit '50615e498e11f356ef582af0f9616945d04faa80':
  Don't pass URL path and username/password to PAC scripts

Change-Id: I2197af29029456780438123c59214c3d8c58a6ef
 2016-05-27 03:04:34 +00:00
Android Build Merger (Role)
f9db0e0cf3 Merge "Merge "Importance slider updates." into nyc-dev am: 2bf73e94c3 am: 901bdeadef" into nyc-mr1-dev-plus-aosp 2016-05-27 03:03:47 +00:00