Commit Graph

266851 Commits

Author SHA1 Message Date
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
Chong Zhang
741c0ba8aa Revert commits related to wallpaper cropping
bug: 28763785
related-to: 27989717
related-to: 28887408

Revert "Fix wallpaper crop during unlock animation"

This reverts commit 616c7c10b9.

Revert "Fix wallpaper cropped too soon when unminimizing dock"

This reverts commit f0b76b071c.

Revert "Set final crop on wallpaper instead of intersect clip with stack bounds"

This reverts commit dcf0183cea.

Revert "Crop wallpaper windows to their current target stack bounds"

This reverts commit e6cb450b0d.
2016-05-27 13:01:48 -07: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
Greg Hackmann
f68cdb9cb4 AlarmManagerService: remove legacy /dev/alarm support
We've removed the Android alarm driver from our supported kernels.  It's
time to remove the userspace callers too: they make the native side of
AlarmManagerService more complex, and send the wrong signal about
/dev/alarm still being supported.

Bug: 28357356

Change-Id: I225d76c3f4e695a831d4419e050e8e178e1224b5
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2016-05-27 12:55:02 -07:00
Bill Yi
c22f3e8866 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9aed8c2fa0 -s ours am: 9f2ffbcd66 -s ours" into nyc-mr1-dev-plus-aosp
am: d5eb34ad35  -s ours

* commit 'd5eb34ad35d5a95095a2fce794e7680c0e7c58a7':

Change-Id: Icb4aa1fe9e891e2fb4570349e5ab427d635feca7
2016-05-27 19:53:31 +00:00
Bill Yi
72f2dd2187 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb8c569414 -s ours am: 8272bb6af4 -s ours" into nyc-mr1-dev-plus-aosp
am: 902c693bae  -s ours

* commit '902c693bae6c3f432dd72f3b55680e13632bf928':

Change-Id: Iadd1aa8f179fec25ff8a9b0ef72698c2fd847b30
2016-05-27 19:48:49 +00:00
Danny Epstein
e85305267e Merge "Top and bottom padding for watch preferences." into nyc-mr1-dev
am: c17513ef37

* commit 'c17513ef376accac19b09875291237a757819450':
  Top and bottom padding for watch preferences.

Change-Id: Ie531b82c336422a375b9bbd5de3d06ca45d0dfab
2016-05-27 19:47:46 +00:00
Jeff Sharkey
f9508873dd Merge "Merge "Delay PACKAGE_RESTARTED until after data cleared." into nyc-dev am: d6ee899397" into nyc-mr1-dev am: 4e8b6bfe69
am: d948e39e94

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

Change-Id: I5bf677218fe3ee19eb667f708d6220c7e82736ee
2016-05-27 19:44:13 +00:00
Jeff Sharkey
3163314ca0 Merge "Merge "Careful process validation for unaware providers." into nyc-dev am: 678dba737b" into nyc-mr1-dev am: 37b78dcdd7
am: a822d4e73a

* commit 'a822d4e73af571a44f73da6701beb0966eb4c5b9':
  Careful process validation for unaware providers.

Change-Id: Id1a9171c660ac2b9266cb36bdda03c1e235dfcdb
2016-05-27 19:38:39 +00:00
Adrian Roos
0533dfb2ca Change app crash dialog strings
Change the reopen option and remove unreferenced reset string.

Change-Id: Ie0a5a5615a7d7e8d01927743ffa13f1ab1099774
Fixes: 28813950
2016-05-27 12:37:32 -07:00
Danny Epstein
c17513ef37 Merge "Top and bottom padding for watch preferences." into nyc-mr1-dev 2016-05-27 19:36:47 +00:00
Winson
96df56b5c1 Merge "Defer calling the stack task removed callbacks. am: 6c8217ab30" into nyc-mr1-dev am: e351f281ef
am: 99a36a841a

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

Change-Id: I65e07e8fa366ea6781654b7bee4799f0ae3b35d8
2016-05-27 19:33:09 +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
Jeff Sharkey
5045a20942 Merge changes from topic \'am-e4ceb878ab564c70a4e1726ee7c0709a\' into nyc-mr1-dev am: 0ce1648f01
am: 68f4e9fbb2

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

Change-Id: I2591d99120519c1850405bafccf88312418fa31d
2016-05-27 19:26:38 +00:00
Makoto Onuki
0b94321ecc Merge "Fix the feldspar-dev branch" into nyc-mr1-dev
am: 7c65d085f4

* commit '7c65d085f4c0f48a6ec604d43eb410467e1cca64':
  Fix the feldspar-dev branch

Change-Id: Ifd22a00c0e9bf27e937cefa46cc317bf9ebc4496
2016-05-27 19:25:52 +00:00
Adrian Roos
ad028c1616 Simplify crash dialog
Remove "Reopen app" for background crashes, remove "Close"
for foreground crashes.

Make crash dialog cancelable with back / tapping outside.

Remove reset option for repeating crashes.

Change-Id: I3773ee6b6986efa35da30830fec223300cda5d75
Fixes: 28768481
Fixes: 28740658
2016-05-27 12:23:42 -07:00
Eric Schmidt
747037816d 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
am: eacf998c56

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

Change-Id: I8ecffa630d71b9578cba814c5006c61e8e0c36ac
2016-05-27 19:22:03 +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
Selim Cinek
268aa24fe6 Merge "Fixed a few memory leaks in SystemUI" into nyc-dev am: 4f401f24c7
am: 077ba466d4

* commit '077ba466d48958db493ac2ee2ff670039f30b046':

Change-Id: I09f506e07801dc616704dcc38a5f4a52326964ec
2016-05-27 19:18:31 +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
Selim Cinek
9d84d9ee51 Added strings for translation with the expand affordance
Bug: 28069681
Change-Id: Ifebc146ed249e6133625607cfc361957e4491882
2016-05-27 12:14:20 -07:00
Julia Reynolds
d3d8e2ba8f Merge "Unlocked access of mServices is bad." into nyc-dev am: d9599faf6b am: c2813e2501
am: 60453d14ad

* commit '60453d14ad737b7bdb77cf8204dcb1450bc3b0c0':
  Unlocked access of mServices is bad.

Change-Id: Iaa4cdffe47be29eb9e4f2302c78d38fb2a97176e
2016-05-27 19:12:04 +00:00
Makoto Onuki
7c65d085f4 Merge "Fix the feldspar-dev branch" into nyc-mr1-dev 2016-05-27 19:11:55 +00:00
Selim Cinek
e431e1e1e3 Merge "Fixed a few memory leaks in SystemUI" into nyc-dev am: 4f401f24c7
am: d6e5332169

* commit 'd6e5332169b8e49bf88eaa69898f36998fa39b4f':
  Fixed a few memory leaks in SystemUI

Change-Id: Id00af9d89b9701f8ee12a6ea7e99973a9da5f456
2016-05-27 19:11:45 +00:00
Julia Reynolds
a9d4838f66 Merge "Reset slider animator on density change" into nyc-dev am: d52a81eeae am: 0e64814c7d
am: df5072d152

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

Change-Id: I838c804b378147f9adb9a3ee50e1e61dffd1bc25
2016-05-27 19:08:46 +00:00
Adrian Roos
5e47645f6d Fix status bar autohide with DirectReply
If a touch outside the status bar window is detected
we schedule autohiding the status bar - which is wrong
when that touch is due to touching the IME for DirectReply.

Bug: 28914905
Change-Id: Ic86612192368181f195fa54ac4f20edaf02af685
2016-05-27 12:07:37 -07:00
Selim Cinek
077ba466d4 Merge "Fixed a few memory leaks in SystemUI" into nyc-dev
am: 4f401f24c7

* commit '4f401f24c79c26a0554331bf13948e402c611015':
  Fixed a few memory leaks in SystemUI

Change-Id: Ief7f5bd3a0386ec2187ec4adf9c23463a9375bd7
2016-05-27 19:05:57 +00:00
Selim Cinek
d6e5332169 Merge "Fixed a few memory leaks in SystemUI" into nyc-dev
am: 4f401f24c7

* commit '4f401f24c79c26a0554331bf13948e402c611015':
  Fixed a few memory leaks in SystemUI

Change-Id: Iba8725618829c316bbf99dd47b0e73526a9ab044
2016-05-27 19:05:41 +00:00
Siyamed Sinir
4e96f6de03 Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev am: 990e26118d
am: 4dc77b7a5e

* commit '4dc77b7a5ecd5d957175b85978471debdf45e028':

Change-Id: I63ca616b1a34b6973d1b97eca9004319fb43058f
2016-05-27 19:04:30 +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
Selim Cinek
4f401f24c7 Merge "Fixed a few memory leaks in SystemUI" into nyc-dev 2016-05-27 18:58:56 +00:00
Android Build Merger (Role)
39cc3f20c2 Merge "Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am: 92d0316d28 am: 3f23dad913" into nyc-mr1-dev-plus-aosp 2016-05-27 18:57:16 +00:00
Siyamed Sinir
3a14be244b Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am: 92d0316d28
am: 3f23dad913

* commit '3f23dad913859d725ad1b63b12ee0e800a47beb7':
  Set StaticLayout.maxLines only when ellipsize is set

Change-Id: I29c05c5359cbc5f969b0c89860a431b0f1342151
2016-05-27 18:56:00 +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
Adrian Roos
dd654eaf40 Fix IME and NavBar overlap with Direct Reply
In phone landscape, when the navigation bar is on the right,
and when the status bar is forcing the IME and NavBar, make
sure that the nav bar and IME don't overlap, even if the
NavBar is only transient.

Bug: 28914905
Change-Id: I22921f1aca7970c2d02dfd88408eb15c5b17151f
2016-05-27 11:46:15 -07: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
Makoto Onuki
b8ea2fdae0 Fix the feldspar-dev branch
Change-Id: Iddc6aaf4eea569739b3857ca40f5754640f15379
2016-05-27 11:39:34 -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
Chih-Hung Hsieh
1099ea59c5 Merge "Fix misc-macro-parentheses warnings in DngCreator." am: d439efc361 am: cfae35a400
am: 86f5b560af

* commit '86f5b560af60d91ed67642bfb7392ba6a7cd45b4':
  Fix misc-macro-parentheses warnings in DngCreator.

Change-Id: Id8b2d4ba5e721815dc612cbf349ceba8bbb32538
2016-05-27 18:24:24 +00:00
Selim Cinek
f55f1bcb94 Fixed a bug where a notification could be stuck in the overlay
Change-Id: Idf07b1948b9baeff095fbeccd417cdad1e81e7f8
Fixes: 28992452
2016-05-27 11:19:11 -07:00
Android Build Merger (Role)
747c16c1e0 Merge "Merge "Doc change: Fix broken link." into mnc-io-docs am: d643ab1ddb am: f9d8f6c5f3 am: 7f1330358a am: 1743e97f3a" into nyc-mr1-dev-plus-aosp 2016-05-27 18:16:30 +00:00
Chih-hung Hsieh
86f5b560af Merge "Fix misc-macro-parentheses warnings in DngCreator." am: d439efc361
am: cfae35a400

* commit 'cfae35a4007316cdff280ecce3d71d8d6074bccc':
  Fix misc-macro-parentheses warnings in DngCreator.

Change-Id: I0e6297b1e2182d4209bf6744e9d35e574883d7da
2016-05-27 18:16:02 +00:00
Mark Goldstein
4f4f0b380b Merge "Doc change: Fix broken link." into mnc-io-docs am: d643ab1ddb am: f9d8f6c5f3 am: 7f1330358a
am: 1743e97f3a

* commit '1743e97f3a1ec9c40b3c799ca34cf01186e38f35':
  Doc change: Fix broken link.

Change-Id: Ic1a1c08af0e222948d0ebe3d0a92601af0a33238
2016-05-27 18:15:50 +00:00
Mark Goldstein
29c870e4e2 Merge "Doc change: Fix broken link." into mnc-io-docs am: d643ab1ddb am: f9d8f6c5f3 am: 7f1330358a
am: 90045710ca

* commit '90045710ca4d1bdad279c40084ad60341f13847d':
  Doc change: Fix broken link.

Change-Id: I8c007a139b0ceb24abd2996649e222fee402ed12
2016-05-27 18:15:20 +00:00