Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix DPM unit tests, also fix a log message.

Browse Source 
am: 6ad5f92512

Change-Id: Ieab914cf8538e3086fb32cc351e45e6a5c2017c5
This commit is contained in:
Makoto Onuki
2016-09-23 15:43:04 +00:00
committed by android-build-merger
parent fa10c2869b 6ad5f92512
commit 2f78ab5387
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -3029,8 +3029,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
if (ai == null) { if (ai == null) {
throw new IllegalStateException("Couldn't find package to remove admin " throw new IllegalStateException("Couldn't find package: "
+ packageName + " " + userHandle); + packageName + " on user " + userHandle);
} }
return (ai.flags & ApplicationInfo.FLAG_TEST_ONLY) != 0; return (ai.flags & ApplicationInfo.FLAG_TEST_ONLY) != 0;
} }

2
services/tests/servicestests/src/com/android/server/devicepolicy/DpmTestBase.java
View File

@@ -131,7 +131,7 @@ public abstract class DpmTestBase extends AndroidTestCase {
doReturn(ai).when(mMockContext.ipackageManager).getApplicationInfo( doReturn(ai).when(mMockContext.ipackageManager).getApplicationInfo(
eq(admin.getPackageName()), eq(admin.getPackageName()),
eq(PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS), anyInt(),
eq(UserHandle.getUserId(packageUid))); eq(UserHandle.getUserId(packageUid)));
// Set up queryBroadcastReceivers(). // Set up queryBroadcastReceivers().