Felipe Leme
feaa8982fc
Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev
...
am: efa291a860
* commit 'efa291a8605e91d775faf46ada349ec7f81fcdb9':
Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.
Change-Id: I11bf96280ac5e143d5260cb20238da38b4e0eaa3
2016-05-27 20:04:25 +00:00
TreeHugger Robot
efa291a860
Merge "Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent." into nyc-dev
2016-05-27 19:58:24 +00:00
Siyamed Sinir
6fe1ab7f21
Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev
...
am: 990e26118d
* commit '990e26118d5b6cad2d34483b1908ba6f8334a764':
Revert "Fix TextView layout reuse when maxLines is set"
Change-Id: I543c1944fafb920b697eb87c92cf0d4ae8339e54
2016-05-27 18:50:51 +00:00
Siyamed Sinir
361f03c4e2
Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev
...
am: 92d0316d28
* commit '92d0316d2837baceffb22e1a7eb0e5da50f0a025':
Set StaticLayout.maxLines only when ellipsize is set
Change-Id: I2b0281da1d8aba5f84da01c00f31d79af901db35
2016-05-27 18:45:20 +00:00
Felipe Leme
a1b79bfd7a
Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.
...
This scenario typically happens when the device is on Doze Mode and a
notification action is triggered from a Wear device.
In a nutshell, the workflow is:
- ProcessRecord has a flag telling whether a process has "whitelist
management" privileges.
- When NotificationManager binds a new NotificationListenerService, it
sets the BIND_ALLOW_WHITELIST_MANAGEMENT flag.
- On bind(), ActiveService asserts that only system apps can set that
flag.
- On computeOomAdjLocked(), ActivityManagerService sets the
ProcessRecord flag if necessary.
- Upon creating a notification, NotificationManager calls AM to mark its
PendingIntents as coming from a notification.
- When PendingIntentRecord sends it to the target, it checks if it's
from a notification and if so calls AM to do the temp whitelist.
- On unbind(), ActiveService removes the ProcessRecord flag if necessary.
Fixes: 28818704
Change-Id: I00d46036a2cbb73f7f733fd35bf0b743a02807a1
2016-05-27 11:45:09 -07:00
Siyamed Sinir
990e26118d
Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev
2016-05-27 18:34:30 +00:00
Siyamed Sinir
92d0316d28
Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev
2016-05-27 18:34:30 +00:00
Ruchi Kandoi
cea28a3935
Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev
...
am: 7730e57dc6
* commit '7730e57dc6624a66cdc35260f855a467fadc7b04':
PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()
Change-Id: I49a0d514677a513aa85c98031a1a111657c6398b
2016-05-27 16:28:03 +00:00
Ruchi Kandoi
7730e57dc6
Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev
2016-05-27 16:20:43 +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
Siyamed Sinir
108b013a51
Revert "Fix TextView layout reuse when maxLines is set"
...
This reverts commit f75775ea7f .
Bug: 28885989
Bug: 28468120
Change-Id: I6fa5401c8a76db1bacc2d8201eece91a3c52b758
2016-05-27 01:37:59 +00:00
Siyamed Sinir
24aba4b9e9
Set StaticLayout.maxLines only when ellipsize is set
...
A partial revert for the CL I5dbc48a6c7f0f4ac4c693d5c95f0a99b989e07f4.
The mentioned CL tried to always set the maxLines attribute of
StaticLayout. However this caused regressions at certain points.
Bug: 28885989
Bug: 28468120
Change-Id: Ic09cb194c8811a06b5d53de50bfb77938b91b88d
2016-05-26 18:33:33 -07:00
Selim Cinek
0361d504da
Merge "Fixed the relative time spoken with accessibility" into nyc-dev
...
am: 38b5946fae
* commit '38b5946fae50d4e9e8f32c985983d03a4437910d':
Fixed the relative time spoken with accessibility
Change-Id: I0f4568af71a996b3d2f0aa65b7b26785423d8221
2016-05-26 22:39:03 +00:00
Selim Cinek
38b5946fae
Merge "Fixed the relative time spoken with accessibility" into nyc-dev
2016-05-26 22:33:51 +00:00
George Mount
b148f83ec0
Merge "Fix Activity Transition mess-up." into nyc-dev
...
am: bd34103c5d
* commit 'bd34103c5defbfd180be6a387eb5aa82d4b97eac':
Fix Activity Transition mess-up.
Change-Id: I3c0785fa6a862d41210b124ab8836c0594990457
2016-05-26 22:21:33 +00:00
George Mount
bd34103c5d
Merge "Fix Activity Transition mess-up." into nyc-dev
2016-05-26 22:15:32 +00:00
Fyodor Kupolov
a32f7ac4a5
Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev
...
am: a4dbdaf5e9
* commit 'a4dbdaf5e96273dccd474e31700d84a1ad907503':
Remove ActivityManager calls with PM.mInstallLock held
Change-Id: Ibc2ccaffa7468df05cf8045fcafbe62387a5d6e0
2016-05-26 18:29:49 +00:00
Fyodor Kupolov
a4dbdaf5e9
Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev
2016-05-26 18:20:36 +00:00
Ruchi Kandoi
c45908d196
PowerManager: Adds Documentation to
...
isSustainedPerformanceModeSupported()
Bug: 28775592
Change-Id: Iea4f77d2508141ac0748165f68e6e1ca235ab804
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com >
2016-05-26 11:18:52 -07:00
Paul Jensen
aa98ab568c
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: Id0ad43abbf8bb1c290912ccc0b6e501ffe998ba2
2016-05-26 18:07:45 +00:00
Paul Jensen
50615e498e
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
* commit '94c8855da6c1e5800723d1eaeceb1cba841bea6b':
Don't pass URL path and username/password to PAC scripts
Change-Id: Ic91dc5c4a0a283bcd177daac8cced12a668bf0d9
2016-05-26 17:59:23 +00:00
Teng-Hui Zhu
b076ee0a42
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: I03e6d183e2a98b4d08f1e5be74447ddf942e8337
2016-05-26 17:53:31 +00:00
Tenghui Zhu
e78ba24c17
Merge "Update the light center when the root view's layout changed" into nyc-dev
2016-05-26 17:48:49 +00:00
Jeff Sharkey
6843da1aa8
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev
...
am: 36cbf5ca37
* commit '36cbf5ca378523bfa4f5394e39f5fcff2b2461de':
Cache IMountService for isUserKeyUnlocked() calls.
Change-Id: I0e4ae30da7c40cf4712147c65bfb0fbec5f84b95
2016-05-26 17:35:16 +00:00
George Mount
f43ea5d4d2
Fix Activity Transition mess-up.
...
Bug 28610520
isTopOfTask() was returns false in onResume always because
it wasn't being made visible until after onResume. The visibility
of the window is not important for this method (older versions
didn't check it at all), so that was removed.
Change-Id: I45e506e72356cc3808e2e9340739726c99da7d97
2016-05-26 10:06:35 -07:00
TreeHugger Robot
36cbf5ca37
Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev
2016-05-26 16:49:51 +00:00
Ji Yang
e6c6ca417d
Merge "Rename carrier messaging API constant." into nyc-dev
...
am: f7375b46ff
* commit 'f7375b46ff9848feba0a9632669d07384954d69e':
Rename carrier messaging API constant.
Change-Id: I476b10118136b13a49b1d55864bbef8e568d6c7e
2016-05-26 15:54:38 +00:00
Ji Yang
f7375b46ff
Merge "Rename carrier messaging API constant." into nyc-dev
2016-05-26 15:40:12 +00:00
Jeff Sharkey
4815ed4500
Cache IMountService for isUserKeyUnlocked() calls.
...
This avoids doing a ServiceManager lookup for every call through
this hot code-path.
Bug: 28946245
Change-Id: I210ce34b33e5b40a5ab4e92ddce87fc5e9964be2
2016-05-26 09:31:06 -06:00
Paul Jensen
94c8855da6
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
* commit '7ff57eaff95fd4cdb3cc80f8e420b469f0656bb8':
Don't pass URL path and username/password to PAC scripts
Change-Id: I80187f003e437678786f0740f23e76543890b9bc
2016-05-26 15:22:55 +00:00
Paul Jensen
7ff57eaff9
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
* commit 'a5a2c88fb3ac43315575de94696c837cb6b88c35':
Don't pass URL path and username/password to PAC scripts
Change-Id: Ia33d40ae5d4b6ee0cd3cfcdc8587d6002603f128
2016-05-26 15:13:07 +00:00
Paul Jensen
a5a2c88fb3
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
* commit '54a62d5febc8771f65221db3dd5c6e08f3288eb8':
Don't pass URL path and username/password to PAC scripts
Change-Id: I1da24c02fbf85a7f0fd3ea7a86ad3a34389000e8
2016-05-26 15:02:46 +00:00
Paul Jensen
54a62d5feb
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
* commit '7c625e1938f28cf2a455fb1f4ab71dca99341b3d':
Don't pass URL path and username/password to PAC scripts
Change-Id: If2e068e47e6efd4b8ad7abc7fb358860b188a380
2016-05-26 14:50:37 +00:00
Michael Wright
4f6ae7bbaa
Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
...
am: c396f0f70e
* commit 'c396f0f70ef40ea0fb42a0872a13f4c4e9a6a5f0':
DO NOT MERGE Remove Pointer Capture API
Change-Id: Iede50a709849ed27cb9723a565b946e00fb23be7
2016-05-26 14:39:03 +00:00
Paul Jensen
7c625e1938
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
* commit '75095e6f02b13d070bb74b019ab6392f0f7b1105':
Don't pass URL path and username/password to PAC scripts
Change-Id: I0da4c878a1bd78837abc40a3ab332c6a1e781d3e
2016-05-26 14:35:08 +00:00
Paul Jensen
75095e6f02
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
* commit '42a59833648243a8ac3aec7adf7f4ca0d3babdd1':
Don't pass URL path and username/password to PAC scripts
Change-Id: Id92ff5deed707c029fc6d5806aff2a324961c2ec
2016-05-26 14:13:16 +00:00
Michael Wright
c396f0f70e
Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
2016-05-26 14:03:47 +00:00
Paul Jensen
42a5983364
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141
...
am: 6c35cf2434
* commit '6c35cf2434ca373196b16620455f8f234b63d594':
Don't pass URL path and username/password to PAC scripts
Change-Id: I9bbca312129011822fc5ea95682bac5ca4258ced
2016-05-26 14:01:19 +00:00
Paul Jensen
6c35cf2434
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff
...
am: bb27626141
* commit 'bb2762614181a0ee03554a96c070ea1006d7263c':
Don't pass URL path and username/password to PAC scripts
Change-Id: I9e4d3282765dec1554955b9f72484e9d7e2d6594
2016-05-26 13:44:37 +00:00
Paul Jensen
bb27626141
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff
...
am: 8940d2b0ff
* commit '8940d2b0ff2fb5a9cc9e12be8a7959670e4390ac':
Don't pass URL path and username/password to PAC scripts
Change-Id: I03d6273d7ddaecac071ab3d1207d3d684e80159e
2016-05-26 13:37:24 +00:00
Paul Jensen
8940d2b0ff
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev
...
am: af0b4466ff
* commit 'af0b4466ffe2ed09b288014d1d3a9ed308fe3c76':
Don't pass URL path and username/password to PAC scripts
Change-Id: I8a49a29ed1999ab811d3306dc46769d83c05244e
2016-05-26 13:30:59 +00:00
Seigo Nonaka
b03e7217f3
Merge "Fix system locale propagation during user creation." into nyc-dev
...
am: ce9f5e3657
* commit 'ce9f5e3657b7a8fb68c6c65a2cd5a27eaf556cc8':
Fix system locale propagation during user creation.
Change-Id: If31dcbe28d108ec12aa9f4aef4382dcb2da90aaf
2016-05-26 04:07:40 +00:00
Seigo Nonaka
ce9f5e3657
Merge "Fix system locale propagation during user creation." into nyc-dev
2016-05-26 03:51:39 +00:00
Selim Cinek
570bfa2768
Fixed the relative time spoken with accessibility
...
The relative time was unclear for certain locales
and even worse 1m was spoken as 1 meter.
Change-Id: Ie172092da27ea8119906b0c301b5569bf3efabbb
Fixes: 28961667
2016-05-25 18:44:44 -07:00
Adam Lesinski
fbdf46f663
Merge "Use app\'s best locale if they override LocaleList" into nyc-dev
...
am: fbf3a0964a
* commit 'fbf3a0964a458508f834bffd18198394037bb5c1':
Use app's best locale if they override LocaleList
Change-Id: I5a38d95f1ea7d7fd676fa60effa467af219c75cf
2016-05-26 01:38:34 +00:00
Adam Powell
0b478d5b05
Merge "N is API 24" into nyc-dev
...
am: bc983c4431
* commit 'bc983c443139c7b4605f98d56bd9ad7652a9938b':
N is API 24
Change-Id: Ib90f6e51c793d1cb61f806196b93736edf2014d8
2016-05-26 01:22:00 +00:00
TreeHugger Robot
fbf3a0964a
Merge "Use app's best locale if they override LocaleList" into nyc-dev
2016-05-26 01:11:03 +00:00
TreeHugger Robot
bc983c4431
Merge "N is API 24" into nyc-dev
2016-05-26 01:03:08 +00:00