| commit | 6ad5f92512462f774a2ff7e59abdf5edbfd215b3 | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Mon Sep 19 14:23:02 2016 -0700 |
| committer | Makoto Onuki <omakoto@google.com> | Mon Sep 19 14:23:02 2016 -0700 |
| tree | 1a843e7bfe0685be49f36840364f9cbc8530f4f8 | |
| parent | d0f20c2bbd95c16a3050aa8acc2ddd1d18ffd82f [diff] |
Fix DPM unit tests, also fix a log message. Bug 31446501 Change-Id: I37debbe2f4e983fb8bad026f8dd9bd91b7448dce
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 777c0b3..ce03f84 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -3010,8 +3010,8 @@ throw new IllegalStateException(e); } if (ai == null) { - throw new IllegalStateException("Couldn't find package to remove admin " - + packageName + " " + userHandle); + throw new IllegalStateException("Couldn't find package: " + + packageName + " on user " + userHandle); } return (ai.flags & ApplicationInfo.FLAG_TEST_ONLY) != 0; }
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmTestBase.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmTestBase.java index c80ca6c..b4b74b3 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmTestBase.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmTestBase.java
@@ -131,7 +131,7 @@ doReturn(ai).when(mMockContext.ipackageManager).getApplicationInfo( eq(admin.getPackageName()), - eq(PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS), + anyInt(), eq(UserHandle.getUserId(packageUid))); // Set up queryBroadcastReceivers().