Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
257,274 Commits 3 Branches 0 Tags
ff8c648dda79ea2ee10f0fd1860d149f31583808
Commit Graph

65518 Commits

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

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

Change-Id: Ia30a5de830ceacf310e1573f55c206d40a679db7
 2016-05-28 01:04:37 +00:00
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
d38541009b Merge "Merge "Add more doc for Object animators defined with a single value" into nyc-dev am: f97a0f5c9c" into nyc-mr1-dev 
am: d01f474773

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

Change-Id: I0f8db3135b7795d8ce40c7d78ce8d9180d3f3b1d
 2016-05-28 00:01:39 +00: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
c67191508b Merge "Fix bad one-line MessagingStyle" into nyc-dev am: 5dbb9ff674 
am: d70126ec78

* commit 'd70126ec780a30d18e65b70c3dcc29f7253352e3':
  Fix bad one-line MessagingStyle

Change-Id: Iba2e4bb6be2dcb6e1800b8863046084a3540a0f2
 2016-05-27 23:18:42 +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
451afea589 Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev 
am: 5b11a81f9f

* commit '5b11a81f9fed69b0b6e233bad4ba8636f47febf7':
  ShortcutManager: Implement get-drawable APIs

Change-Id: If0c3279fe7374382a2f7148435b009c02e7d7e88
 2016-05-27 22:52:43 +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
d70126ec78 Merge "Fix bad one-line MessagingStyle" into nyc-dev 
am: 5dbb9ff674

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

Change-Id: I3dd2c32f3fee1e61d63da8903ae468d9e8da19c0
 2016-05-27 22:08:06 +00:00
Adrian Roos
5dbb9ff674 Merge "Fix bad one-line MessagingStyle" into nyc-dev 2016-05-27 22:02:38 +00:00
Jorim Jaggi
bdcfbf442b Merge "Close IME when attaching dock stack" into nyc-dev am: c5fc6c602c 
am: 819cbb3dd3

* commit '819cbb3dd32bb0c721b4fef427f4ed84e208b15a':
  Close IME when attaching dock stack

Change-Id: I31b42a8f971f74e11febe9635fa6489924914226
 2016-05-27 21:20:58 +00:00
Jorim Jaggi
26dea2d518 Merge "Close IME when attaching dock stack" into nyc-dev 
am: c5fc6c602c

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

Change-Id: I40abf80fcea522c8082e622c33f3a6726f781145
 2016-05-27 21:15:26 +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
d786355405 Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev am: efa291a860 
am: 8c8ea506d9

* commit '8c8ea506d91db44de1d312612a8f63ab107af799':
  Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.

Change-Id: Iaffe5981b299eca5756666bd03c67a84c8e15283
 2016-05-27 20:08:59 +00:00
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
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
Amith Yamasani
df2297dcf3 Merge "Helper method to check if current user is a demo user" into nyc-mr1-dev 
am: 5df14a60cf

* commit '5df14a60cf4eb5340d9339244ca7ba2485495531':
  Helper method to check if current user is a demo user

Change-Id: I94f08185ccbc3ce16add9279a584a3c739d03432
 2016-05-27 19:32:35 +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
af57bd751f Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev am: 990e26118d 
am: 6fe1ab7f21

* commit '6fe1ab7f21a7b8d1b88334020a6f11aea6b7a771':
  Revert "Fix TextView layout reuse when maxLines is set"

Change-Id: I9141cc021ed511988f8fd4d9f6b4ea7d04aca270
 2016-05-27 19:00:11 +00:00
Siyamed Sinir
3e7177f91f Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am: 92d0316d28 
am: 361f03c4e2

* commit '361f03c4e2c774c074ef98ab2631e28288690034':
  Set StaticLayout.maxLines only when ellipsize is set

Change-Id: I15d616a7b448dc8e63c1a7d0ac136be98669a869
 2016-05-27 18:55:30 +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
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
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
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
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
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
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
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
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
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