Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
265,047 Commits 3 Branches 0 Tags
b21f69181f89ccb4ddee757e37bfaad09eb9d02e
Commit Graph

67053 Commits

Author SHA1 Message Date
Amith Yamasani
69c76ce387 Merge "Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""" into nyc-mr1-dev am: aabbfc5565 
am: a3bc135bb4

* commit 'a3bc135bb413bb159847926e0ccdf99acf125360':
  Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""

Change-Id: Ifa8f6f8e195bca93af058914c5b1797f3294df6e
 2016-05-27 23:35:36 +00:00
Makoto Onuki
09c6612288 resolve merge conflicts of 8de7c95 to master 
Change-Id: I04447215323c7582554dc5f6ae8b105308c6f623
 2016-05-27 16:10:34 -07:00
Ruchi Kandoi
3dc9df699b Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev am: 7730e57dc6 am: e9f42318f6 
am: fcb3aa4a68

* commit 'fcb3aa4a681021c95f55673f18141502667320e3':
  PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()

Change-Id: I2acde231a58d82ea15a20757dbf3bac8f9edbba6
 2016-05-27 22:53:48 +00:00
Alan Viverette
e40e318b4f Merge "resolve merge conflicts of f118700 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp am: 9ab249bef2 
am: 32148220f7

* commit '32148220f7e31ca100fad42c31841159aa639be4':
  Chronometer: Update the value only if displayed on screen

Change-Id: Icf53d90ea83f54457b77bec28291efe92b4c1c88
 2016-05-27 22:53:45 +00:00
Adam Lesinski
ddacd0f779 Merge "Merge "Fix issue where max idle time > total idle time" into nyc-dev am: 89046edb4d am: fc7c27b215" into nyc-mr1-dev-plus-aosp 
am: 0c67994e33

* commit '0c67994e33f0c5ae471a83129cf8b7ec9eb54ef7':
  Fix issue where max idle time > total idle time

Change-Id: Ia9cf5c89afc542f14ac3ca664e8a2baa0f3d1218
 2016-05-27 22:13:57 +00:00
Bart Sears
63a75e3b89 Revert "Remove ActivityManager calls with PM.mInstallLock held" 
This reverts commit ac06a4907b.

Change-Id: I27bedbd221a8d416b9040a96063e66a1ca69fe2e
 2016-05-27 21:28:50 +00:00
The Android Automerger
6f2f02e4ae Merge commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611' 
* commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611':
  docs: Refinements for testing
  Fix toast with accessibility and app pinning
  Updated link to material design page.
  Change overdraw test to use windowbackground
  Prevent callbacks during DrawableContainer child initialization
  Fixing crash in SysUI due to invalid group.
  Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.
  Fix Activity Transition mess-up.
  Time to #NameAndroidN!
  Prevent use of a null sCallbackObj by Hardware FLP
  Fixed the relative time spoken with accessibility
  Use backstop timeouts on asynchronous countdown during preflight
 2016-05-27 20:05:56 +00:00
Christine Hallstrom
f44d5bcf4f Merge "Properly check if BT is off when shutting down radios" into nyc-mr1-dev am: 0f760e0815 
am: fa72d4caff

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

Change-Id: I16d921e8aac53b21c4007e697dc4d5e2f2a4fa4f
 2016-05-27 19:17:03 +00:00
Fyodor Kupolov
2d8583e0e4 Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev am: a4dbdaf5e9 am: 5d531e4f6c 
am: f6816ad3c5

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

Change-Id: I98ea0d1c547c5f044bf7fc9c231e7f19b6c39c95
 2016-05-27 17:50:31 +00:00
Amith Yamasani
a3bc135bb4 Merge "Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""" into nyc-mr1-dev 
am: aabbfc5565

* commit 'aabbfc5565a6fee8b1fbdaa26f050ee6617b3370':
  Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""

Change-Id: Iaf1a47b3c5091771902b0a3630d83067d3b75440
 2016-05-27 17:46:48 +00:00
Paul Jensen
b569d8bbf9 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 
am: 257c5b2e9c

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

Change-Id: If9f1006bd7d4ab2acc3ce3e75a0746f6ca44b01a
 2016-05-27 17:42:22 +00:00
TreeHugger Robot
aabbfc5565 Merge "Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""" into nyc-mr1-dev 2016-05-27 17:36:43 +00:00
Makoto Onuki
8de7c953a1 Merge "ShortcutManager: Support manifest shortcuts" into nyc-mr1-dev 
am: 05e0a9f3cf

* commit '05e0a9f3cf632e237654c13f6d223eb22ea3be89':
  ShortcutManager: Support manifest shortcuts

Change-Id: Ib0a2620e92249452130a681208424fbddfa1935b
 2016-05-27 17:34:04 +00:00
Tenghui Zhu
09cd5ea578 Merge "Merge "Update the light center when the root view\'s layout changed" into nyc-dev am: e78ba24c17 am: 56d4dae9ec" into nyc-mr1-dev-plus-aosp 
am: d09ad72e82

* commit 'd09ad72e82c9ca66eea4e2409589813e20d9a8bf':
  Update the light center when the root view's layout changed

Change-Id: Ifb58bf9a0a0e3b11d9c59d2c04218d63c294f0ae
 2016-05-27 17:24:49 +00:00
Makoto Onuki
05e0a9f3cf Merge "ShortcutManager: Support manifest shortcuts" into nyc-mr1-dev 2016-05-27 17:21:53 +00:00
Makoto Onuki
22fcc68e6b ShortcutManager: Support manifest shortcuts 
- Now apps can publish shortcuts via AndroidManifest.xml
(Sample: I5b127150)

- Rename some APIs per API council feedback

- Publishers can now "disable" shortcuts.
(https://docs.google.com/presentation/d/1raUn1QBURDb1yrd6mSmVxII9ezNh3MWukODdtufJ29U/edit#slide=id.g13ef592464_7_39)

Bug 28785283
Bug 28536066

Change-Id: I4a126841e43e40139bb4baa6d0f98ad7b3a75ac1
 2016-05-27 09:40:58 -07:00
Ruchi Kandoi
fcb3aa4a68 Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev am: 7730e57dc6 
am: e9f42318f6

* commit 'e9f42318f61889133ad7fdcbe28bbd58f0c6739e':
  PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()

Change-Id: I89f6847cba38d9e2f833892c7a849c49261e8814
 2016-05-27 16:32:29 +00:00
Ruchi Kandoi
e9f42318f6 Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev 
am: 7730e57dc6

* commit '7730e57dc6624a66cdc35260f855a467fadc7b04':
  PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()

Change-Id: If4934466722851e9c7ca1443cae3e31f2b25c6c7
 2016-05-27 16:28:03 +00:00
Amith Yamasani
ea1b9d7958 Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held"" 
Added the missing import.

This reverts commit c51e725644.

Change-Id: Icd63619a12e10dee628e568a6200d429a9936cf0
 2016-05-27 09:25:37 -07:00
Ruchi Kandoi
7730e57dc6 Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev 2016-05-27 16:20:43 +00:00
Jeff Sharkey
9b34b66b66 resolve merge conflicts of 58db550 to master 
Change-Id: I39f7760c008af1d4a107b6b929b44c79d2f463be
 2016-05-27 10:12:55 -06:00
Alan Viverette
32148220f7 Merge "resolve merge conflicts of f118700 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp 
am: 9ab249bef2

* commit '9ab249bef26c82fe7e15e0f7d036fa63c41074d7':
  Chronometer: Update the value only if displayed on screen

Change-Id: I53a3fbca00fe44b6d2d6f055280175e01e2b827b
 2016-05-27 15:15:10 +00:00
Alan Viverette
99de597c71 resolve merge conflicts of f118700 to nyc-dev-plus-aosp 
Change-Id: I6fc2b3d279318c5c34a1f4b2921d3c1eff8ac627
 2016-05-27 11:04:59 -04:00
Simon Dubray
f1187008c1 Merge "Chronometer: Update the value only if displayed on screen" 
am: 34cd48bcd8

* commit '34cd48bcd8d284d864a0876db1373099c51b98e2':
  Chronometer: Update the value only if displayed on screen

Change-Id: I01a820daaa6308c1cc00cd19940db12ec827f424
 2016-05-27 14:26:23 +00:00
Alan Viverette
34cd48bcd8 Merge "Chronometer: Update the value only if displayed on screen" 2016-05-27 14:18:20 +00:00
Bart Sears
02f466e491 Revert "Remove ActivityManager calls with PM.mInstallLock held" 
am: c51e725644

* commit 'c51e725644be6d46e25c29e8774b542d52c29400':
  Revert "Remove ActivityManager calls with PM.mInstallLock held"

Change-Id: I1feafc8a4fbda585815624d4069973530b6864d4
 2016-05-27 04:25:25 +00:00
Bart Sears
c51e725644 Revert "Remove ActivityManager calls with PM.mInstallLock held" 
This reverts commit ac06a4907b.

Change-Id: I27bedbd221a8d416b9040a96063e66a1ca69fe2e
 2016-05-27 04:18:50 +00:00
Adam Lesinski
408002879c Merge "Fix issue where max idle time > total idle time" into nyc-dev am: 89046edb4d 
am: fc7c27b215

* commit 'fc7c27b21596fbc379d08add355b90893d9a0e25':
  Fix issue where max idle time > total idle time

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

* commit '828d70166742f11740f9a953164f984a32db5fa8':
  Fixed the relative time spoken with accessibility

Change-Id: I717e571849e293093e626a99e07ca307abee8f96
 2016-05-27 03:44:44 +00:00
Adam Lesinski
fc7c27b215 Merge "Fix issue where max idle time > total idle time" into nyc-dev 
am: 89046edb4d

* commit '89046edb4d64fe1c7662103cce3a82b69e05cfe4':
  Fix issue where max idle time > total idle time

Change-Id: I22908fb8f1c8ee7325687cebf646c3a03f6e1ea7
 2016-05-27 03:34:58 +00:00
Wyatt Riley
a1ad1996a8 Merge "Prevent use of a null sCallbackObj by Hardware FLP" into nyc-dev am: 793ac34219 
am: 8453136b8e

* commit '8453136b8ee7ba361d4180df75328466292c9610':
  Fix Activity Transition mess-up.

Change-Id: I3904d1d8782c07f0a869243802c1e1dc8d6e49b1
 2016-05-27 03:29:22 +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
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
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
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
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
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
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
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
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
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
Tenghui Zhu
2f86522d7d Merge "Update the light center when the root view\'s layout changed" into nyc-dev am: e78ba24c17 
am: 56d4dae9ec

* commit '56d4dae9ec7503660bdd762e2e04f267d7f2704c':
  Update the light center when the root view's layout changed

Change-Id: Ifedcb88adb38eb23ad82b7836c5de5f738c80c10
 2016-05-27 03:02:14 +00:00
Jeff Sharkey
58db5505c7 Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am: 36cbf5ca37 
am: bda14dd987

* commit 'bda14dd987498d4c75dcbbe7b4bba73db165c1c8':
  Cache IMountService for isUserKeyUnlocked() calls.

Change-Id: Ic5577c55324a52e761919febc0cab9af0e18e919
 2016-05-27 02:58:50 +00:00
Teng-Hui Zhu
56d4dae9ec Merge "Update the light center when the root view\'s layout changed" into nyc-dev 
am: e78ba24c17

* commit 'e78ba24c176fd6a0c54eaf7e52be545952ba1ab7':
  Update the light center when the root view's layout changed

Change-Id: Ic973b9b47df6550c5170c2248c7e0f2ab25c6a57
 2016-05-27 02:50:14 +00:00
Jeff Sharkey
bda14dd987 Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev 
am: 36cbf5ca37

* commit '36cbf5ca378523bfa4f5394e39f5fcff2b2461de':
  Cache IMountService for isUserKeyUnlocked() calls.

Change-Id: I1ad2d1eba64a89e7a22dc86c7241f6f85a5f2a0b
 2016-05-27 02:42:44 +00:00
Adam Lesinski
7e762beb7f Merge "Fix issue where max idle time > total idle time" into nyc-dev 
am: 89046edb4d

* commit '89046edb4d64fe1c7662103cce3a82b69e05cfe4':
  Fix issue where max idle time > total idle time

Change-Id: Idfbfa60ec62002712073ae9af3c3e4c0e39be1e7
 2016-05-27 01:52:32 +00:00
Adam Lesinski
89046edb4d Merge "Fix issue where max idle time > total idle time" into nyc-dev 2016-05-27 01:44:32 +00:00
Fyodor Kupolov
63cd09dfb4 Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev am: 2c5cbd4012 
am: 0ebf3cc47c

* commit '0ebf3cc47c9d20613f02ca263a2394d80455a09a':
  Clean up demo dir when leaving demo mode

Change-Id: Ib3338a18e75f04e15a1d77a82e5ac1aba246a5bb
 2016-05-27 01:02:29 +00:00
Fyodor Kupolov
0ebf3cc47c Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev 
am: 2c5cbd4012

* commit '2c5cbd4012aef736c94a7afc84a778623c639d10':
  Clean up demo dir when leaving demo mode

Change-Id: Ia7891f8e5106130d669a1daa7fcc691db1f5e4c7
 2016-05-27 00:54:20 +00:00