commit | 18fb24c5d3e8f9e2a66e78f13a7fa2567fbd3231 | [log] [tgz] |
---|---|---|
author | Makoto Onuki <omakoto@google.com> | Fri Sep 23 15:34:37 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 23 15:34:40 2016 +0000 |
tree | bb1f9c4bb34d616e8adfc5417be391bf4a62f75f | |
parent | 69659cb96df2b149bbb0577179f16712054a8bc2 [diff] | |
parent | 6ad5f92512462f774a2ff7e59abdf5edbfd215b3 [diff] |
Merge "Fix DPM unit tests, also fix a log message." into nyc-mr1-dev
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 0c0fe8b..c2ffa9b 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -3029,8 +3029,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().