1a2cd74526113b45d9108b6997609122c4311fb1 - platform_frameworks_base

commit	1a2cd74526113b45d9108b6997609122c4311fb1	[log] [tgz]
author	Makoto Onuki <omakoto@google.com>	Mon Nov 16 13:51:27 2015 -0800
committer	Makoto Onuki <omakoto@google.com>	Thu Nov 19 13:37:21 2015 -0800
tree	49b6c787e7681351458491dc8abfa237c2124e88
parent	9920e0f1cc6e527c719fb7bfa70ae9e75ea4565c [diff]

More work on layered user restrictions.

- Now when DO/PO sets a user restriction, DPMS pushes it to UMS and
then UMS persists it, in order for UserManager.hasUserRestriction()
to never have to talk with DPMS, which would cause lock inversion.

- Also apply user restrictions when a user start.

- This is an updated version of the abandoned CL -- the difference
is, ActivityManager no longer has to call DPMS.

- Also removed an unnecessary write to userlist.xml in UMS.
upgradeIfNecessaryLP().

Bug 23902097
Bug 25388912
Bug 25354031
Bug 25641040

Change-Id: I0948aea06ad7d0f45fe612a431d765faddfe3c58

core/java/android/app/admin/DevicePolicyManagerInternal.java[diff]
core/java/android/os/UserManagerInternal.java[diff]
services/core/java/com/android/server/am/UserController.java[diff]
services/core/java/com/android/server/pm/UserManagerService.java[diff]
services/core/java/com/android/server/pm/UserRestrictionsUtils.java[diff]
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java[diff]
services/devicepolicy/java/com/android/server/devicepolicy/Owners.java[diff]
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java[diff]
services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java[diff]
services/tests/servicestests/src/com/android/server/devicepolicy/MockUtils.java[diff]
services/tests/servicestests/src/com/android/server/devicepolicy/OwnersTest.java[diff]
services/tests/servicestests/src/com/android/server/pm/UserRestrictionsUtilsTest.java[Added - diff]

12 files changed

tree: 49b6c787e7681351458491dc8abfa237c2124e88