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

Commit 4d600d15 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clear affiliation ids and lock task packages when clearing DO/PO"

parents 6c149326 a7bd04e8

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -6706,6 +6706,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        policy.mDelegationMap.clear();

        policy.mDelegationMap.clear();

        policy.mStatusBarDisabled = false;

        policy.mStatusBarDisabled = false;

        policy.mUserProvisioningState = DevicePolicyManager.STATE_USER_UNMANAGED;

        policy.mUserProvisioningState = DevicePolicyManager.STATE_USER_UNMANAGED;

        policy.mAffiliationIds.clear();

        policy.mLockTaskPackages.clear();

        saveSettingsLocked(userId);

        saveSettingsLocked(userId);





        try {

        try {

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

+10 −0
Original line number Original line Diff line number Diff line
@@ -2089,9 +2089,19 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        assertTrue(dpm.getAffiliationIds(admin2).isEmpty());

        assertTrue(dpm.getAffiliationIds(admin2).isEmpty());

        assertFalse(dpm.isAffiliatedUser());

        assertFalse(dpm.isAffiliatedUser());





        // Set affiliation ids again, then clear PO to check that the user becomes unaffiliated

        dpm.setAffiliationIds(admin2, userAffiliationIds);

        assertTrue(dpm.isAffiliatedUser());

        dpm.clearProfileOwner(admin2);

        assertFalse(dpm.isAffiliatedUser());



        // Check that the system user remains affiliated.

        // Check that the system user remains affiliated.

        mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID;

        mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID;

        assertTrue(dpm.isAffiliatedUser());

        assertTrue(dpm.isAffiliatedUser());



        // Clear the device owner - the user becomes unaffiliated.

        clearDeviceOwner();

        assertFalse(dpm.isAffiliatedUser());

    }

    }





    public void testGetUserProvisioningState_defaultResult() {

    public void testGetUserProvisioningState_defaultResult() {