diff options
| author | 2017-01-12 11:08:50 +0000 | |
|---|---|---|
| committer | 2017-01-12 11:08:54 +0000 | |
| commit | dfbfca2015c33d3cbdf438d54774d0bab85b5986 (patch) | |
| tree | 233321504dd61b4c5e3ee96a6225984a67192da5 | |
| parent | 17ca0e43a1b409cc61d49359e973013b57024b60 (diff) | |
| parent | feffb056e8d0f22db630f7d768bd78c349420cb6 (diff) | |
Merge "Fix DevicePolicyManagerServiceMigrationTest."
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java index 3a6b983854af..b440095e60cc 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java @@ -183,7 +183,8 @@ public class DevicePolicyManagerServiceMigrationTest extends DpmTestBase { // Check the new owner restrictions. DpmTestUtils.assertRestrictions( DpmTestUtils.newRestrictions( - UserManager.DISALLOW_ADD_USER + UserManager.DISALLOW_ADD_USER, + UserManager.DISALLOW_ADD_MANAGED_PROFILE ), dpms.getDeviceOwnerAdminLocked().ensureUserRestrictions()); |