Commit Graph

8742 Commits

Author SHA1 Message Date
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
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
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
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
Adrian Roos
8406ea9c7b Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e am: 80c470bd52
am: ddaa2e1fec

* commit 'ddaa2e1fec45287f7099120f0b6e75aed9e4c10d':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: Iaea682e2a45c35d9114466d010c98c120e8847c9
2016-05-23 23:38:16 +00:00
Adrian Roos
ddaa2e1fec Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e
am: 80c470bd52

* commit '80c470bd52af8b5db26cc0aae24da10135883c0d':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: I9a4309d22dbc58081387771ec228c32e2db2cf84
2016-05-23 23:23:40 +00:00
Adrian Roos
6d2e1e45f0 Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev
am: d15cc7a83e

* commit 'd15cc7a83e8d6251d4cf78bb08ee26b9ae949b58':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: I584f2e8ce46358ecdcb1189f3e46400d6f07d346
2016-05-23 23:15:29 +00:00
Adrian Roos
80c470bd52 Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev
am: d15cc7a83e

* commit 'd15cc7a83e8d6251d4cf78bb08ee26b9ae949b58':
  Deprecate unnecessairy Notification.Style constructors

Change-Id: I35dac10df46e313fbe013fcc09337f8e9ac95890
2016-05-23 23:14:35 +00:00
TreeHugger Robot
d15cc7a83e Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev 2016-05-23 23:04:36 +00:00
Selim Cinek
954cc230ed Fixed a bug where the text directionality was inconsistent
The title would not be fully right aligned because it wasn't
layouted with match_parent because there could be a second visible
text when there is a progressbar.

Change-Id: I73d97d9a8addaec0e3b849349f220c764fa45db0
Fixes: 27893267
2016-05-23 15:00:22 -07:00
Dianne Hackborn
5035d29dcc Fix issue #28868955: CTS: PendingIntentTest failures; Regressed in NRD48x
Uh, yeah.

Change-Id: I452187fcdda634ebf00e5d6bcaa45433f348c17e
2016-05-23 14:39:45 -07:00
Adrian Roos
f5faf9db14 Deprecate unnecessairy Notification.Style constructors
Change-Id: I7a15eaaac4f756d137483aec5f389951c5a7eecb
Fixes: 28775574
2016-05-23 14:00:07 -07:00
Chris Wren
601b4eef88 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev am: 0a9ccf2619 am: 688ebc6f75
am: f9f6d64ed8

* commit 'f9f6d64ed8406dc6417cc88c9e49d68d45c3773a':
  Never fetch notification badges for USER_SYSTEM

Change-Id: I25e158bfe98d4bca60a7e460b6c6bd6784caade0
2016-05-23 17:58:04 +00:00
Chris Wren
f9f6d64ed8 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev am: 0a9ccf2619
am: 688ebc6f75

* commit '688ebc6f753ad574e1e2ca3f67acf592abe53d5c':
  Never fetch notification badges for USER_SYSTEM

Change-Id: I8492b9148b66b9aef69362b10de10ef8f991ecc7
2016-05-23 17:53:25 +00:00
Chris Wren
688ebc6f75 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev
am: 0a9ccf2619

* commit '0a9ccf26192bc5a6fd74afb7afd4834b08230299':
  Never fetch notification badges for USER_SYSTEM

Change-Id: I0e4bd4aaf4c6513c289ca948f63c5bc5c3c7ed02
2016-05-23 17:47:29 +00:00
Chris Wren
66bd6bca16 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev
am: 0a9ccf2619

* commit '0a9ccf26192bc5a6fd74afb7afd4834b08230299':
  Never fetch notification badges for USER_SYSTEM

Change-Id: Ic6530a6b92c26d68a25ab15d24779b5f3f10f35a
2016-05-23 17:47:29 +00:00
Chris Wren
0a9ccf2619 Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev 2016-05-23 17:44:16 +00:00
Chad Brubaker
532bbd2438 Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387 am: 76d3d8590d
am: be04f7247a

* commit 'be04f7247a5835bcba2f598e9d47e0a07d08af3d':
  Use an attribute for the network security config resource

Change-Id: I5c2213114bf26a4506a64c5a5a8a2e592610783d
2016-05-23 02:44:34 +00:00
Chad Brubaker
be04f7247a Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387
am: 76d3d8590d

* commit '76d3d8590d1fb9a9c341159fbc06914ef19bdb8d':
  Use an attribute for the network security config resource

Change-Id: I15da47a2cd78dc37019bd20847d13248612c77f5
2016-05-23 02:38:19 +00:00
Chad Brubaker
76d3d8590d Merge "Use an attribute for the network security config resource" into nyc-dev
am: 6812bdf387

* commit '6812bdf38797101d3744befe70f3501b75f01ce6':
  Use an attribute for the network security config resource

Change-Id: I2236b69a2af2258e7600a4833fe7be95f64e6260
2016-05-23 02:32:19 +00:00
Chad Brubaker
c6a49bb008 Merge "Use an attribute for the network security config resource" into nyc-dev
am: 6812bdf387

* commit '6812bdf38797101d3744befe70f3501b75f01ce6':
  Use an attribute for the network security config resource

Change-Id: I470b8e991d590135223066d18b49ff123e0b1f6e
2016-05-23 02:32:19 +00:00
Chris Wren
66619a2ea1 Never fetch notification badges for USER_SYSTEM
This user never gets a badge, and secondary users will
see a security exception attempting to fetch it for
USER_ALL notifications, such as USB and battery state,
which are posted by USER_SYSTEM.

Bug: 28743335
Change-Id: I65aeb1cf2192811055f8cd94df0b7e292c5c1acf
2016-05-20 14:24:55 -04:00
Chad Brubaker
c845b2a21c Use an attribute for the network security config resource
Originally we went with the meta-data approach to make unbundling
easier, however with the amount of platform changes that the config
ended up relying on it would be better to focus on exposing it through
the platform.

Bug:28763009
Change-Id: Iaf80001b1980220cd2e1e05faf2dc86af41700e1
2016-05-19 17:25:41 -07:00
The Android Automerger
1ec2fd72ce stephenli@ manually merge many commits up to '032dcff'
* commit '032dcff': (22 commits)
  Remove outdated google services links.
  Fix misc-macro-parentheses warnings in services jni.
  Fix misc-macro-parentheses warnings in hwui and graphic jni.
  Fix misc-macro-parentheses warnings in aapt and androidfw.
  docs: Update to column widths for Complications table
  Fix a11y crash when window layer isn't unique.
  Never set resized while not drag resizing for pinned stack.
  While turning OFF do not honor ON requests.
  Fix GATT autoConnect race condition
  Fix GATT autoConnect race condition
  Fix RTL issue in delete dialog.
  Incorporate feedback on new wallpaper-related APIs
  Mapping up/down of legacy Gps vs. Gnss Status
  Fixed a bug where the chronometer was invisible
  Fixed a bug where the chronometer wasn't updating the time
  Update BlockedNumberContract javadocs.
  [RenderScript] Fix ScriptIntrinsicBlur documentation.
  Update documentation about copyTo and copyFrom.
  DO NOT MERGE Cherry pick libpng usage fixes
  Start the Wear Time System Service with SystemServer
  ...
2016-05-19 23:51:32 +00:00
Sergio Giro
cfc00030cc resolve merge conflicts of 882c7d2 to master
Change-Id: I1235236c405e46fc984c7dda743fc6815ba7aab9
2016-05-19 22:11:37 +01:00
Selim Cinek
e934d32862 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev am: 2486cb2c89
am: e9b32c77f8

* commit 'e9b32c77f88a2acb7e7e23fbd14f6b4f373cba0b':
  Fixed a bug where the chronometer was invisible

Change-Id: Ie6f36bca7345f7b1f86425e993deb7d617bbc4d5
2016-05-19 20:54:37 +00:00
Selim Cinek
b9d4cd81a3 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev
am: 2486cb2c89

* commit '2486cb2c8978003d2b5cfa7e8169019421582cb0':
  Fixed a bug where the chronometer was invisible

Change-Id: Ib495f096b5b2bc758ce7224fae33ba1a44c027a2
2016-05-19 20:51:04 +00:00
Selim Cinek
e9b32c77f8 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev
am: 2486cb2c89

* commit '2486cb2c8978003d2b5cfa7e8169019421582cb0':
  Fixed a bug where the chronometer was invisible

Change-Id: I8caf83fdb4a27e477e644123d349bc4951eda0dd
2016-05-19 20:49:24 +00:00
TreeHugger Robot
2486cb2c89 Merge "Fixed a bug where the chronometer was invisible" into nyc-dev 2016-05-19 20:40:26 +00:00
Christopher Tate
2b2ad77fdb Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev
am: 9d37bdcb91

* commit '9d37bdcb91dffbfeebc45ef5ae7724c556cb6864':
  Incorporate feedback on new wallpaper-related APIs

Change-Id: I0dce83effbb05d52e2bcfb6f0ff48badbab71655
2016-05-19 19:44:42 +00:00
Chris Tate
2467a7fe90 Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev am: 9d37bdcb91
am: 3de573733c

* commit '3de573733c05d204589d9c56fb26fbb985ecc060':
  Incorporate feedback on new wallpaper-related APIs

Change-Id: I7cbca080286f54040782c79eab57f2285cee222d
2016-05-19 19:44:15 +00:00
Christopher Tate
3de573733c Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev
am: 9d37bdcb91

* commit '9d37bdcb91dffbfeebc45ef5ae7724c556cb6864':
  Incorporate feedback on new wallpaper-related APIs

Change-Id: Iea24b4a97c72248c185f8756b8b74b8b60f3c05f
2016-05-19 19:38:48 +00:00
Chris Tate
9d37bdcb91 Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev 2016-05-19 19:34:08 +00:00
Sergio Giro
882c7d244c Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev am: 44b9f13f9c
am: 3eb0680642

* commit '3eb06806429f444fe87b894308681e20e6871c7d':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: Ia3c21577450bc028548e8427a4a0f9f552e4890f
2016-05-19 18:21:50 +00:00
Sergio Giro
14c9a306ad Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev
am: 44b9f13f9c

* commit '44b9f13f9cfaf2e1136a1f2baab54b229d221fe4':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: I22e0d3b3967ad205e0e9aad328790e907335ed17
2016-05-19 18:10:04 +00:00