Commit Graph

8773 Commits

Author SHA1 Message Date
Adrian Roos
f8bddb4840 Merge "Fix bad one-line MessagingStyle" into nyc-dev am: 5dbb9ff674 am: d70126ec78
am: c67191508b

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

Change-Id: I96b15a9c1121f8c9be257722380ded5235bd5a93
2016-05-28 00:32:56 +00:00
Felipe Leme
6afa2e1d1d Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev am: efa291a860 am: 8c8ea506d9
am: d786355405

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

Change-Id: Ic8f6cbfce572c54d7124a508af12043a58d5bc66
2016-05-27 23:43:14 +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
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
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
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
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
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
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
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
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
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
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
Adam Lesinski
e3b163035d Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a0964a am: fbdf46f663
am: 0c2f681bdf

* commit '0c2f681bdfacc5504c101945d5421f892184a007':
  Use app's best locale if they override LocaleList

Change-Id: I9913e7466450a83bd5872abc62cfaac3d235d8d8
2016-05-26 02:45:13 +00:00
Adam Lesinski
0c2f681bdf Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a0964a
am: fbdf46f663

* commit 'fbdf46f66323e80d4e90e926d0f199b64bf71f14':
  Use app's best locale if they override LocaleList

Change-Id: I99bb920efcc7befa2817bed3a7fb7a0bcad4a13e
2016-05-26 02:10:48 +00: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 Lesinski
ade0bce32a 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: I980061c2e818a746eb46e64a88887be8566ad618
2016-05-26 01:38:22 +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
Adam Lesinski
27d301667b Use app's best locale if they override LocaleList
App's can technically override their configuration's Locale,
which means we must choose the overriden locale as the best,
and therefore set the LocaleList.setDefault() with that locale.

Bug:28953437
Change-Id: I4b301fcd6bc426e37bb389d3a6f2b4a3c69ac33a
2016-05-25 16:45:14 -07:00
Antonio Cansado
4342f4419f Merge "Cleaning up NetworkStatsManager." into nyc-dev am: c45f0aea71 am: f49cbec84c
am: cc1524eded

* commit 'cc1524edede07e2139cd072d6256fa96952f4004':
  Cleaning up NetworkStatsManager.

Change-Id: I3f669191e7c7739870dc098d5d6357d1d3ceb6dd
2016-05-25 22:43:26 +00:00
Antonio Cansado
cc1524eded Merge "Cleaning up NetworkStatsManager." into nyc-dev am: c45f0aea71
am: f49cbec84c

* commit 'f49cbec84c1e2aa21b33d54ae97c54ed9c71bb32':
  Cleaning up NetworkStatsManager.

Change-Id: I0fd280e158eb3cfeb0b4f6066cc890439cffa02c
2016-05-25 22:34:18 +00:00
Antonio Cansado
c37ba5cbc1 Merge "Cleaning up NetworkStatsManager." into nyc-dev
am: c45f0aea71

* commit 'c45f0aea71944464b7636023f56a53fa635c09e2':
  Cleaning up NetworkStatsManager.

Change-Id: I236ffb5f753834931511d7df01333670de01604f
2016-05-25 22:25:27 +00:00
Antonio Cansado
f49cbec84c Merge "Cleaning up NetworkStatsManager." into nyc-dev
am: c45f0aea71

* commit 'c45f0aea71944464b7636023f56a53fa635c09e2':
  Cleaning up NetworkStatsManager.

Change-Id: Id556eb00f5183a2f6905020f24f5d3f5f8d02795
2016-05-25 22:25:11 +00:00
Antonio Cansado
904237f839 Cleaning up NetworkStatsManager.
- Throwing SecurityExceptionand and IllegalArgumentException instead of null for new APIs
- removing @removed APIs

Bug:27530098,27379882
Change-Id: Ifbe65bfc5051aa33aff2baa22cfa8e67b0f7c358
2016-05-25 11:07:41 -07:00
TreeHugger Robot
e1b53d7cab Merge "Add missing @Deprecated annotations." 2016-05-25 17:46:40 +00:00
Ricky Wai
b581ebee69 Do not allow DPM.resetPassword() when child profile exists or user is locked am: 977ade26dd am: 2281b83051
am: cdb948c81c

* commit 'cdb948c81cdae49a46972bd6ff9acbb02a4a99ce':
  Do not allow DPM.resetPassword() when child profile exists or user is locked

Change-Id: I9b1fb2e49954ac7720e10b809d313e599b17dad1
2016-05-25 13:27:34 +00:00
Ricky Wai
cdb948c81c Do not allow DPM.resetPassword() when child profile exists or user is locked am: 977ade26dd
am: 2281b83051

* commit '2281b83051f8f2d14dfc0a366ed54b1716370412':
  Do not allow DPM.resetPassword() when child profile exists or user is locked

Change-Id: Ia43caa8b23eced60a8ef187ed100b106aedb74a3
2016-05-25 13:23:24 +00:00
Ricky Wai
2281b83051 Do not allow DPM.resetPassword() when child profile exists or user is locked
am: 977ade26dd

* commit '977ade26dd8bc6a442be2db2470459058246844f':
  Do not allow DPM.resetPassword() when child profile exists or user is locked

Change-Id: If87e0c523af3fdbd5d0f0182037fba0758cb4cfb
2016-05-25 13:15:33 +00:00
Ricky Wai
fdf928d4b5 Do not allow DPM.resetPassword() when child profile exists or user is locked
am: 977ade26dd

* commit '977ade26dd8bc6a442be2db2470459058246844f':
  Do not allow DPM.resetPassword() when child profile exists or user is locked

Change-Id: I05277051a8f30c4d020440dd01b5dc284d552fd4
2016-05-25 13:14:23 +00:00
Ricky Wai
977ade26dd Do not allow DPM.resetPassword() when child profile exists or user is locked
Bug: 28878708
Change-Id: Iaae2a9ba9c7c0ff388264c474c78a0dcd9fec258
2016-05-25 13:09:44 +00:00
Aurimas Liutikas
514c5ef8d5 Add missing @Deprecated annotations.
Add missing @Deprecated annotations for methods with @deprecated tag
in javadoc.

Change-Id: I35b78ccb97832d86b914c21a300444ba29e33844
2016-05-24 15:22:55 -07:00
Adam Lesinski
534881d8fa Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb am: 5e106dea45
am: 9ed84d8612

* commit '9ed84d86120dd6487eacba503f45f6d147f05fbf':
  Improve performance of LocaleList with Resources

Change-Id: I7c1694545f9eee940ca7065f3ac5aee5e2a7b27c
2016-05-24 21:47:36 +00:00
Adam Lesinski
9ed84d8612 Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb
am: 5e106dea45

* commit '5e106dea4545547f3f7c50dad30f792809659b96':
  Improve performance of LocaleList with Resources

Change-Id: I733cdad0b30069ac7830fa91ef0188dd0f0cfac9
2016-05-24 21:41:20 +00:00
Adam Lesinski
5e106dea45 Merge "Improve performance of LocaleList with Resources" into nyc-dev
am: bb26248bbb

* commit 'bb26248bbba6e4014ea89a97b86618b7289a5f29':
  Improve performance of LocaleList with Resources

Change-Id: Ic43a26915a28d71a967eb038331a0f3c31bdfe8f
2016-05-24 21:35:56 +00:00
Adam Lesinski
5e5e871fdc Merge "Improve performance of LocaleList with Resources" into nyc-dev
am: bb26248bbb

* commit 'bb26248bbba6e4014ea89a97b86618b7289a5f29':
  Improve performance of LocaleList with Resources

Change-Id: I307b4a7c78ff04797fda041afa8106b082951bc9
2016-05-24 21:34:48 +00:00
Adam Lesinski
bb26248bbb Merge "Improve performance of LocaleList with Resources" into nyc-dev 2016-05-24 21:25:41 +00:00
Selim Cinek
1ca8998d18 Merge "Fix first notification of each app is not shown" into nyc-dev am: ed353f1738 am: 40a6b1dbb5
am: a6954bc53c

* commit 'a6954bc53c7682c89f8f354bb019882e87b62bc0':
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

Change-Id: Ica13b23532b0d207d05068d8ecbd8c01f66006ee
2016-05-24 20:26:29 +00:00
Tony Mak
a6954bc53c Merge "Fix first notification of each app is not shown" into nyc-dev am: ed353f1738
am: 40a6b1dbb5

* commit '40a6b1dbb53fd4a8d499ee9ad0ba953137cfecec':
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

Change-Id: I820cdd49b8bd04dd05fd18f2bf8456182ba6a725
2016-05-24 20:20:58 +00:00
Selim Cinek
40a6b1dbb5 Merge changes I7773ed3a,I73d97d9a into nyc-dev
am: c178f519b9

* commit 'c178f519b94b239aa02633dae7127e619f5b0aa6':
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

Change-Id: Id9b18a7cdd1ed97a06916e6a29b7294551c33acf
2016-05-24 20:16:16 +00:00
Tony Mak
f03a50c4cb Merge "Fix first notification of each app is not shown" into nyc-dev
am: c178f519b9

* commit 'c178f519b94b239aa02633dae7127e619f5b0aa6':
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

Change-Id: I42fa93677ccd0d58d7b71f274f77af867f065ac4
2016-05-24 20:16:05 +00:00
Selim Cinek
c178f519b9 Merge changes I7773ed3a,I73d97d9a into nyc-dev
* changes:
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent
2016-05-24 20:01:24 +00:00
Adam Lesinski
b61e405397 Improve performance of LocaleList with Resources
We allow each individual Resources object to select the best
Locale for the given APK. This allows one update to the configuration
instead of multiple updates, once the locale is chosen.

The Java locale is selected from the app context's locale.

Bug:28625993
Bug:27325465
Change-Id: I99e1e53f522e560f3b80bbd1e1c605f552dbdff0
2016-05-24 12:54:48 -07:00
Dianne Hackborn
4debcd04a1 Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad am: 74ebf3ec67
am: c21fa8c3f6

* commit 'c21fa8c3f62f0fff8145a3512554b4b432104db4':
  Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x

Change-Id: Ie07d802b416a0b6a04777dc762d5968b93fa1a2c
2016-05-24 00:39:39 +00:00
Jaewan Kim
c21fa8c3f6 Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad
am: 74ebf3ec67

* commit '74ebf3ec67ddbbf7752da120a57c4624d4e1655f':
  Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x

Change-Id: I6c01fb9689735a6214bd9f3b29d4dd50a8744388
2016-05-24 00:35:36 +00:00
Dianne Hackborn
74ebf3ec67 Merge "Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev
am: 9c252700f6

* commit '9c252700f6686767f5418677800ba171f441dddc':
  Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x

Change-Id: Ib2811fb49299da93459066d9d6312d403681eed4
2016-05-24 00:30:32 +00:00
Dianne Hackborn
f7003f512f Merge "Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev
am: 9c252700f6

* commit '9c252700f6686767f5418677800ba171f441dddc':
  Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x

Change-Id: I9f3aa6eedbf66eceee0fcaed95a862bea656e359
2016-05-24 00:30:30 +00:00
Dianne Hackborn
9c252700f6 Merge "Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x" into nyc-dev 2016-05-24 00:18:39 +00:00