Commit Graph

9049 Commits

Author SHA1 Message Date
Nicolas Prévot
56d8d05e8a Merge "Show policy transparency screen if adding an account is not allowed." 2016-06-27 14:45:35 +00:00
Nicolas Prevot
709a63d9c0 Show policy transparency screen if adding an account is not allowed.
If DISALLOW_MODIFY_ACCOUNTS has been set by a profile/device owner,
or account management is disabled:
When an app tries to add an account, show the policy transparency screen.

BUG:26762383
Change-Id: I721220c37c74493020f5a1be1f15731e9863a1de
2016-06-27 14:10:38 +01:00
Adam Lesinski
3d26f768a2 Merge \\"Update DisplayMetrics when resizing\\" into nyc-mr1-dev am: 038084e61c
am: 89aea239cd

Change-Id: I9cc73d39e690d30c736b705235bb93e92bd029a6
2016-06-24 22:15:56 +00:00
Adam Lesinski
89aea239cd Merge \"Update DisplayMetrics when resizing\" into nyc-mr1-dev
am: 038084e61c

Change-Id: I82318bbd8dbf03ab4bc01533b8c5650306cff0aa
2016-06-24 22:11:14 +00:00
TreeHugger Robot
038084e61c Merge "Update DisplayMetrics when resizing" into nyc-mr1-dev 2016-06-24 22:04:15 +00:00
Adam Lesinski
8e8d23214a Update DisplayMetrics when resizing
Previously the DisplayMetrics passed to a new ResourcesImpl
object would be generated from the default DisplayAdjustments.
We now use the correct DisplayAdjustments for the ResourcesImpl
and make sure to update them for things like rotation changes.

Bug:29619314
Change-Id: If2ba0d7670a4554dcd3fde9766e2337f20a191fd
2016-06-24 13:13:19 -07:00
Amith Yamasani
2e33e0df3c Merge \\"Resetting some settings on starting a new demo session\\" into nyc-mr1-dev am: bb1fb395ca
am: 5c451c08bc

Change-Id: I7e44f3ec7c29d0e1adfd5e4baff1cbfba7368bcc
2016-06-24 16:42:47 +00:00
Suprabh Shukla
5c451c08bc Merge \"Resetting some settings on starting a new demo session\" into nyc-mr1-dev
am: bb1fb395ca

Change-Id: Ic7b7520d4fa3cbfc79be49ded8a4ffd133d2b037
2016-06-24 16:36:55 +00:00
Amith Yamasani
bb1fb395ca Merge "Resetting some settings on starting a new demo session" into nyc-mr1-dev 2016-06-24 16:08:16 +00:00
Jorim Jaggi
584093c4bf Merge \"Merge \\"Fix WallpaperInfo API review\\" into nyc-mr1-dev am: e3f410cd59\" into nyc-mr1-dev-plus-aosp
am: 17fedfbdc7

Change-Id: I2eb0781e704ebe1ec9f198a332fe162136af3897
2016-06-24 01:38:10 +00:00
Jorim Jaggi
5cd3e8396d Merge \"Fix WallpaperInfo API review\" into nyc-mr1-dev
am: e3f410cd59

Change-Id: Id4486196793d8cc82ee6b4a230bf357785a7842f
2016-06-24 01:32:49 +00:00
TreeHugger Robot
e3f410cd59 Merge "Fix WallpaperInfo API review" into nyc-mr1-dev 2016-06-24 01:24:01 +00:00
Suprabh Shukla
6472501f2e Resetting some settings on starting a new demo session
Muting ringer and media volume and turning off the flashlight
before starting a new session. Also, resetting the configuration of any
new demo user to the configuration of user 0 on the device. Moved
RetailDemoModeService and RetailDemoModeServiceInternal to more
appropriate new packages

Bug: 29519612
Change-Id: Ib65f89ce61afab2d2f1b2dd0c761f5d35a466181
2016-06-23 17:36:19 -07:00
Jorim Jaggi
d136ba1664 Fix WallpaperInfo API review
Change-Id: I395b9617038450e6fa7a2f25bb55d6ae5f761015
Fixes: 29514598
2016-06-23 16:25:52 -07:00
Scott Main
b9d2791a65 Merge \"Merge \\\"fix bad contrast in table links by switching to normal table cells instead of headings.\\\" into nyc-dev am: fd0eeb0379 am: 8c9bd9cb28\" into nyc-mr1-dev-plus-aosp
am: 10aee22fa1

Change-Id: I5b17cb4187ceece4adc7284534b151ec1fee8003
2016-06-23 22:19:42 +00:00
Fyodor Kupolov
1d84a7ffef Merge \"Merge \\"Print names of observers causing timeout\\" into nyc-mr1-dev am: 38d7897690\" into nyc-mr1-dev-plus-aosp
am: a5b7b96500

Change-Id: I04decfb9d3988e5080ab3ff5c88032836dd1306a
2016-06-23 22:11:49 +00:00
Scott Main
afd1e8e259 Merge \\"fix bad contrast in table links by switching to normal table cells instead of headings.\\" into nyc-dev am: fd0eeb0379
am: 8c9bd9cb28

Change-Id: I557f9300ab69486a26f30bed5a244baee43319e7
2016-06-23 22:10:29 +00:00
smain@google.com
b8516f1029 Merge \"fix bad contrast in table links by switching to normal table cells instead of headings.\" into nyc-dev
am: fd0eeb0379

Change-Id: I68b578ac0bb343dff66bcbc5bd5c652c93e9864f
2016-06-23 22:06:07 +00:00
smain@google.com
8c9bd9cb28 Merge \"fix bad contrast in table links by switching to normal table cells instead of headings.\" into nyc-dev
am: fd0eeb0379

Change-Id: I3662c41848c20bfde90dcd453917e67f93693e74
2016-06-23 22:05:07 +00:00
Fyodor Kupolov
7ccd3241e0 Merge \"Print names of observers causing timeout\" into nyc-mr1-dev
am: 38d7897690

Change-Id: I45f06a2167e11733829c660c7baaae3996d8c7eb
2016-06-23 21:58:36 +00:00
Fyodor Kupolov
38d7897690 Merge "Print names of observers causing timeout" into nyc-mr1-dev 2016-06-23 21:49:05 +00:00
Chong Zhang
b31d51b199 Merge \\"Do not send unhandled system config changes to app\\" into nyc-mr1-dev am: 568507abf5
am: fac7476990

Change-Id: I49a971425f294ab8301fb2514a4d8f7a6f5634f0
2016-06-23 21:48:37 +00:00
Chong Zhang
fac7476990 Merge \"Do not send unhandled system config changes to app\" into nyc-mr1-dev
am: 568507abf5

Change-Id: I4a711464f49c44f329e51d781dbe0eb4886d9c98
2016-06-23 21:41:12 +00:00
Chong Zhang
568507abf5 Merge "Do not send unhandled system config changes to app" into nyc-mr1-dev 2016-06-23 21:33:55 +00:00
Chong Zhang
4951f9d6f6 Do not send unhandled system config changes to app
If the config change is system-level and the app doesn't handle
it, it will definitely get relaunched and we don't need to call
onConfigurationChanged.

bug: 29367672
Change-Id: I3193d4b63d316295c9e73d42d000ab4eb5c1a6ad
2016-06-23 20:27:53 +00:00
smain@google.com
10e29b895e fix bad contrast in table links by switching to normal table cells instead of headings.
Change-Id: I91139ac2f01a9e099ffb5f65f4579a0b33ced5ab
2016-06-23 12:09:30 -07:00
Jeff Sharkey
d4ed628995 Merge \\\"When uninstalling, only kill the requested user.\\\" into nyc-dev am: 060d5a0e0a am: eaa1c9ae42
am: 68106fc9bb

Change-Id: I2257e663979d4b34e0736b807b3765aa7b2aa060
2016-06-23 18:39:57 +00:00
Jeff Sharkey
68106fc9bb Merge \\"When uninstalling, only kill the requested user.\\" into nyc-dev am: 060d5a0e0a
am: eaa1c9ae42

Change-Id: Ifb9552c07ed4a055908e8c2e118eec2ff6ae4640
2016-06-23 18:21:59 +00:00
Jeff Sharkey
803a316d6e Merge \"When uninstalling, only kill the requested user.\" into nyc-dev
am: 060d5a0e0a

Change-Id: I25a7bffc2c5f414fe326963c028000eaa492f540
2016-06-23 18:16:45 +00:00
Jeff Sharkey
eaa1c9ae42 Merge \"When uninstalling, only kill the requested user.\" into nyc-dev
am: 060d5a0e0a

Change-Id: I3975462d7f027cc4fd449c56ba0c5f6442369a1b
2016-06-23 18:15:27 +00:00
Fyodor Kupolov
0b77ef9f51 Print names of observers causing timeout
Pass and store name in registerUserSwitchObserver and later print names of
observers causing timeout.

Bug: 29039588
Change-Id: I09c4bcc986168a07f5e20ad0f38667b783332288
2016-06-23 11:07:56 -07:00
TreeHugger Robot
060d5a0e0a Merge "When uninstalling, only kill the requested user." into nyc-dev 2016-06-23 18:03:27 +00:00
Jeff Sharkey
85f449eaba When uninstalling, only kill the requested user.
When an app is being uninstalled for a specific user, only kill the
app under that user; leave the app running under other users.

Bug: 28875343
Change-Id: Ie60753cfd22df10a2b17d8c3732b6f19d2fe1fb9
2016-06-23 10:15:17 -06:00
Dianne Hackborn
9a4172245e Merge \\\"Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)\\\" into nyc-dev am: 576e6d27bd am: c7ebca2a36
am: 569b988e22

Change-Id: Ibb8b0004ee7f1f6208558718247bfaa0b5a04348
2016-06-23 03:25:01 +00:00
Dianne Hackborn
569b988e22 Merge \\"Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)\\" into nyc-dev am: 576e6d27bd
am: c7ebca2a36

Change-Id: I3cc1de9010c77d1de0f36e6ad164ff107d176cbe
2016-06-23 03:19:32 +00:00
Dianne Hackborn
a8816eaf0e Merge \"Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)\" into nyc-dev
am: 576e6d27bd

Change-Id: Iaf58242c587cbfbc5a98a8083f29a9c7d6b6b940
2016-06-23 03:10:16 +00:00
Dianne Hackborn
c7ebca2a36 Merge \"Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)\" into nyc-dev
am: 576e6d27bd

Change-Id: Ib4589d04fa8c157a51ccc87508969d5d93788242
2016-06-23 03:09:56 +00:00
Dianne Hackborn
576e6d27bd Merge "Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)" into nyc-dev 2016-06-23 03:04:26 +00:00
Dianne Hackborn
17c77536ec Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)
I really have no idea how this can be happening (we check
for a null intent before posting the args), but add another
check before dispatching to try to avoid it.

Change-Id: Ic704850c9750b6a078c49ea628189be568031086
2016-06-22 16:55:47 -07:00
Adam Powell
103bd9bf00 Merge "Clarify Fragment#setUserVisibleHint guarantees in docs" 2016-06-22 23:40:28 +00:00
Adam Lesinski
b5c8a98b76 Merge \\\"ContextImpl: Keep DisplayAdjustments and Display in sync\\\" into nyc-dev am: 0bf31c3fa6 am: a72a6aae37
am: ce71c120df

Change-Id: I93c1714ded50dc0233185f68b08b7b7803cfc264
2016-06-22 21:22:15 +00:00
Adam Powell
7f46c1b73f Clarify Fragment#setUserVisibleHint guarantees in docs
Note that setUserVisibleHint can be called from outside of the
fragment lifecycle. Some apps override it and expect otherwise,
and the bug fix for N will affect their expectations.

https://code.google.com/p/android/issues/detail?id=213681

Bug 29526496

Change-Id: I68d5690cefe5f354313f3d89e8ec5ebccaf2544f
2016-06-22 13:30:26 -07:00
Adam Lesinski
ce71c120df Merge \\"ContextImpl: Keep DisplayAdjustments and Display in sync\\" into nyc-dev am: 0bf31c3fa6
am: a72a6aae37

Change-Id: I8c85a4bb67d470c5bba5bcf81915e4684019027b
2016-06-22 19:27:30 +00:00
Adam Lesinski
a72a6aae37 Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
am: 0bf31c3fa6

Change-Id: If0da3136f1fcb17c43a5b8c22ca890b8abcfc25c
2016-06-22 19:17:43 +00:00
Adam Lesinski
e894efa9b6 Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
am: 0bf31c3fa6

Change-Id: Id0d16d2f9d69b87d4b4c01370eeceafe329d1817
2016-06-22 19:16:44 +00:00
Adam Lesinski
0bf31c3fa6 Merge "ContextImpl: Keep DisplayAdjustments and Display in sync" into nyc-dev 2016-06-22 19:11:36 +00:00
Dianne Hackborn
c0b583d4d6 Merge \\\"Fix issue #29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\\\" into nyc-dev am: a62a7eef24 am: 56197c9e9e
am: 2d1788828f

Change-Id: Ic6d314804c6ff6af3ef0f85e6ebe01b0b6847ecf
2016-06-22 17:35:40 +00:00
Dianne Hackborn
2d1788828f Merge \\"Fix issue #29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\\" into nyc-dev am: a62a7eef24
am: 56197c9e9e

Change-Id: I332d08b49f51558d090b43ff0ed566ae9fbfa002
2016-06-22 17:24:25 +00:00
Dianne Hackborn
56197c9e9e Merge \"Fix issue #29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\" into nyc-dev
am: a62a7eef24

Change-Id: I62361e51b439e563b91e86d6886d5b46f64737b0
2016-06-22 17:18:38 +00:00
Dianne Hackborn
3f19c95ec5 Merge \"Fix issue #29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\" into nyc-dev
am: a62a7eef24

Change-Id: Ieb9435479b727da5ea3ce5f512b43986898675fd
2016-06-22 17:18:29 +00:00