Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 357ca56f authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

Fix DPM unit tests, also fix a log message. am: 6ad5f925 am: 2f78ab53 

am: 4001a2b4

Change-Id: Ifc1735798074af6758da5cc3a40d9adada1376cb
parents 42a99377 4001a2b4

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -3029,8 +3029,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            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;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ public abstract class DpmTestBase extends AndroidTestCase { 


        doReturn(ai).when(mMockContext.ipackageManager).getApplicationInfo(

                eq(admin.getPackageName()),

                eq(PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS),

                anyInt(),

                eq(UserHandle.getUserId(packageUid)));



        // Set up queryBroadcastReceivers().