From feffb056e8d0f22db630f7d768bd78c349420cb6 Mon Sep 17 00:00:00 2001 From: Pavel Grafov Date: Wed, 11 Jan 2017 20:51:49 +0000 Subject: Fix DevicePolicyManagerServiceMigrationTest. DISALLOW_ADD_MANAGED_PROFILE is enabled for device owners by default and should be expected for device owner after migration. Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java Change-Id: I8e1d8bcf84a242fa50985d4fed9c3c594e19451a --- .../server/devicepolicy/DevicePolicyManagerServiceMigrationTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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()); -- cgit v1.2.3-59-g8ed1b