Commit Graph

58161 Commits

Author SHA1 Message Date
Christopher Tate
8cc9f36067 Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev
am: b182735757

* commit 'b182735757630db7e84e577c999b9e7d8a288353':
  Don't call .toString() on potentially null CharSequence

Change-Id: I7242f7f064f6695956a9b529f38c2ece82effbcb
2016-05-28 00:57:39 +00:00
Chris Tate
b182735757 Merge "Don't call .toString() on potentially null CharSequence" into nyc-dev 2016-05-28 00:52:11 +00:00
Christopher Tate
f135b271bf Don't call .toString() on potentially null CharSequence
We're building an exception message string, but by explicitly invoking
.toString() we're accidentally triggering an NPE rather than the typed
exception we want to throw.  Build the string in a way that will be
safe and sensical even if the CharSequence is null.

Bug 29009255

Change-Id: I1813260f0b36fd44506b8327f997dd20c2d6c8bf
2016-05-27 17:13:10 -07:00
Doris Liu
55455b2da3 Merge "Add more doc for Object animators defined with a single value" into nyc-dev
am: f97a0f5c9c

* commit 'f97a0f5c9c501bc7e39c779ebb2e009e1ea496cd':
  Add more doc for Object animators defined with a single value

Change-Id: I14cfe5e0a80832b57a270b5b34164d7e4232feeb
2016-05-27 23:56:47 +00:00
TreeHugger Robot
f97a0f5c9c Merge "Add more doc for Object animators defined with a single value" into nyc-dev 2016-05-27 23:51:18 +00:00
Adrian Roos
7d4da18d03 Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev
am: 5dbb9ff674

* commit '5dbb9ff67468979214542eb6a448711d2d614cdb':
  Fix bad one-line MessagingStyle

Change-Id: I1b6cf5033b970aea74fed1ac07c93fe69b7fb1de
2016-05-27 23:12:29 +00:00
Makoto Onuki
5b11a81f9f Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev 2016-05-27 22:48:33 +00:00
Doris Liu
3c85983996 Add more doc for Object animators defined with a single value
Bug: 28104516
Change-Id: I181b2817ceda5dfaf87e12c81b21e7d0d2f002fc
2016-05-27 15:08:46 -07:00
Adrian Roos
5dbb9ff674 Merge "Fix bad one-line MessagingStyle" into nyc-dev 2016-05-27 22:02:38 +00:00
Jorim Jaggi
819cbb3dd3 Merge "Close IME when attaching dock stack" into nyc-dev
am: c5fc6c602c

* commit 'c5fc6c602c16f0e985d8f8ba7f94075229e52320':
  Close IME when attaching dock stack

Change-Id: I7921bf88bb49134d1fbde752d5fa963786ec1d46
2016-05-27 21:15:22 +00:00
Jorim Jaggi
3c5d0f1041 Close IME when attaching dock stack
So we don't end up with animation weirdness.

Bug: 28905720
Change-Id: I04124995dd99fa26d2e9be467c5976d7b20810a7
2016-05-27 21:08:39 +00:00
Felipe Leme
8c8ea506d9 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: Ibd09b082140b66d25bd8583040761581bb20af76
2016-05-27 20:04:22 +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
TreeHugger Robot
5df14a60cf Merge "Helper method to check if current user is a demo user" into nyc-mr1-dev 2016-05-27 19:21:41 +00:00
Siyamed Sinir
4dc77b7a5e 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: Ia2c2d22b40c4613c54c9d86a29f21059da3f7a42
2016-05-27 18:50:50 +00:00
Siyamed Sinir
3f23dad913 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: I17934afae1d5e8b7fe3b3ad8b4286dd43f68393e
2016-05-27 18:45:17 +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
Amith Yamasani
d35a89cd80 Helper method to check if current user is a demo user
Bug: 27280140
Change-Id: I7f6ed3198a42b4f8b81b54764e0b73499a94f77c
2016-05-27 11:13:00 -07:00
Makoto Onuki
04b9aab945 ShortcutManager: Implement get-drawable APIs
Bug 28594168

Change-Id: I750e800b59dca56877ba78baac808aff93acd19d
2016-05-27 10:49:17 -07: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
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
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
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
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
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
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
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
Fyodor Kupolov
2c5cbd4012 Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev 2016-05-27 00:48:38 +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
bd34103c5d Merge "Fix Activity Transition mess-up." into nyc-dev 2016-05-26 22:15:32 +00:00
Christine Hallstrom
995c90aa18 Properly check if BT is off when shutting down radios
Use BluetoothAdapter#getState() instead of
BluetoothAdapter#isEnabled() when checking if Bluetooth has turned
off, as isEnabled() is set to false early in the shutdown process
and getState() provides a better indication of the state of BT.

Bug: 27354612
Change-Id: Ic7828f0726491d49c9a14ba5d654b24f66743662
2016-05-26 13:20:56 -07:00
Adrian Roos
b1f427c7c4 Fix bad one-line MessagingStyle
The one-line non-group version of MessagingStyle causes
a bug with the action bar and generally looks bad because
it is too short. To fix, show this variant like a BigText
notification.

Change-Id: I8af9e9da8286599b81ccb7c4637471ac01795366
Fixes: 28767094
2016-05-26 13:13:47 -07: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
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
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
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
f8969b233c Merge "Rename carrier messaging API constant." into nyc-dev
am: f7375b46ff

* commit 'f7375b46ff9848feba0a9632669d07384954d69e':
  Rename carrier messaging API constant.

Change-Id: I0e6713e07899cde7780b433c0f3053e344e6d327
2016-05-26 15:54:27 +00:00
Ji Yang
f7375b46ff Merge "Rename carrier messaging API constant." into nyc-dev 2016-05-26 15:40:12 +00:00