OSDN Git Service

Make disallow add/remove managed profile restriction not global.
authorNicolas Prevot <nprevot@google.com>
Thu, 5 Jan 2017 10:29:34 +0000 (10:29 +0000)
committerNicolas Prevot <nprevot@google.com>
Thu, 5 Jan 2017 11:58:21 +0000 (11:58 +0000)
commit2ea46fe658c5a977a11372d7180e8ed9abf261e8
tree95950e91bee6473d6acf2c9a271c1c5adac90c02
parentd12655b851daa41e770089ff33f86ba82f624ce3
Make disallow add/remove managed profile restriction not global.

Otherwise: if the DO sets remove managed profile user restriction:
the profile owner of a managed profile cannot remove this managed
profile.

BUG:33854430
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I90b2028ea627a2073298bf9ef3c07b4fdf8d13a1
core/java/android/os/UserManager.java
services/core/java/com/android/server/pm/UserRestrictionsUtils.java
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java