d37c4a99b2602dd4483ca2985e63b5316e8f4f63 - SHIFTPHONES/android_frameworks_base

commit	d37c4a99b2602dd4483ca2985e63b5316e8f4f63	[log] [tgz]
author	Nicolas Prevot <nprevot@google.com>	Mon Jan 23 11:56:00 2017 +0000
committer	Nicolas Prevot <nprevot@google.com>	Tue Jan 24 16:36:14 2017 +0000
tree	b91c7eecf18b72d75d92e8bba50f3858fb86c58d
parent	45d29078635372e6c6b230d3de4e9d94c0d324b1 [diff]

Allow DO to provision even if it has set disallow remove mp.

If the device owner has set DISALLOW_REMOVE_MANAGED_PROFILE,
and there is already a managed profile:
it should be allowed to provision a new managed profile by
deleting the old one.
Test: adb shell am instrument -e class
com.android.server.devicepolicy.DevicePolicyManagerTest
-w
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
BUG:34116228

Change-Id: I9e6f39924107aee40b57d22e638487a1ea3132de

core/java/android/os/IUserManager.aidl[diff]
core/java/android/os/UserManager.java[diff]
services/core/java/com/android/server/pm/UserManagerService.java[diff]
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java[diff]
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java[diff]

5 files changed

tree: b91c7eecf18b72d75d92e8bba50f3858fb86c58d