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

Commit 95f64a10 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Automerger Merge Worker
Browse files

Merge changes from topic "fixSettingsCrash" into udc-dev am: 25ffa223 am: 8ce16aad 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22967537



Change-Id: I3502932a6020357ec9c3ab86cae7754d3692573c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fe52e68b 8ce16aad

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

+32 −0
Original line number Diff line number Diff line
@@ -684,6 +684,38 @@ final class DevicePolicyEngine { 
        }

    }



    <V> void transferPolicies(EnforcingAdmin oldAdmin, EnforcingAdmin newAdmin) {

        Set<PolicyKey> globalPolicies = new HashSet<>(mGlobalPolicies.keySet());

        for (PolicyKey policy : globalPolicies) {

            PolicyState<?> policyState = mGlobalPolicies.get(policy);

            if (policyState.getPoliciesSetByAdmins().containsKey(oldAdmin)) {

                PolicyDefinition<V> policyDefinition =

                        (PolicyDefinition<V>) policyState.getPolicyDefinition();

                PolicyValue<V> policyValue =

                        (PolicyValue<V>) policyState.getPoliciesSetByAdmins().get(oldAdmin);

                setGlobalPolicy(policyDefinition, newAdmin, policyValue);

            }

        }



        for (int i = 0; i < mLocalPolicies.size(); i++) {

            int userId = mLocalPolicies.keyAt(i);

            Set<PolicyKey> localPolicies = new HashSet<>(

                    mLocalPolicies.get(userId).keySet());

            for (PolicyKey policy : localPolicies) {

                PolicyState<?> policyState = mLocalPolicies.get(userId).get(policy);

                if (policyState.getPoliciesSetByAdmins().containsKey(oldAdmin)) {

                    PolicyDefinition<V> policyDefinition =

                            (PolicyDefinition<V>) policyState.getPolicyDefinition();

                    PolicyValue<V> policyValue =

                            (PolicyValue<V>) policyState.getPoliciesSetByAdmins().get(oldAdmin);

                    setLocalPolicy(policyDefinition, newAdmin, policyValue, userId);

                }

            }

        }



        removePoliciesForAdmin(oldAdmin);

    }



    private Set<UserRestrictionPolicyKey> getUserRestrictionPolicyKeysForAdminLocked(

            Map<PolicyKey, PolicyState<?>> policies,

            EnforcingAdmin admin) {

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

+84 −44

File changed.

Preview size limit exceeded, changes collapsed.

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

+13 −0
Original line number Diff line number Diff line
@@ -1512,6 +1512,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
     * Validates that when the device owner is removed, the reset password token is cleared

     */

    @Test

    @Ignore("b/277916462")

    public void testClearDeviceOwner_clearResetPasswordToken() throws Exception {

        mContext.callerPermissions.add(android.Manifest.permission.MANAGE_DEVICE_ADMINS);

        mContext.callerPermissions.add(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS);
@@ -2602,6 +2603,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
    }



    @Test

    @Ignore("b/277916462")

    public void testSetApplicationHiddenWithDO() throws Exception {

        mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID;

        setupDeviceOwner();
@@ -2627,6 +2629,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
    }



    @Test

    @Ignore("b/277916462")

    public void testSetApplicationHiddenWithPOOfOrganizationOwnedDevice() throws Exception {

        final int MANAGED_PROFILE_USER_ID = CALLER_USER_HANDLE;

        final int MANAGED_PROFILE_ADMIN_UID =
@@ -4373,6 +4376,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
    }



    @Test

    @Ignore("b/277916462")

    public void testSetAutoTimeZoneEnabledModifiesSetting() throws Exception {

        mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID;

        setupDeviceOwner();
@@ -4384,6 +4388,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
    }



    @Test

    @Ignore("b/277916462")

    public void testSetAutoTimeZoneEnabledWithPOOnUser0() throws Exception {

        mContext.binder.callingUid = DpmMockContext.SYSTEM_UID;

        setupProfileOwnerOnUser0();
@@ -4395,6 +4400,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
    }



    @Test

    @Ignore("b/277916462")

    public void testSetAutoTimeZoneEnabledFailWithPONotOnUser0() throws Exception {

        setupProfileOwner();

        assertExpectException(SecurityException.class, null,
@@ -4404,6 +4410,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
    }



    @Test

    @Ignore("b/277916462")

    public void testSetAutoTimeZoneEnabledWithPOOfOrganizationOwnedDevice() throws Exception {

        setupProfileOwner();

        configureProfileOwnerOfOrgOwnedDevice(admin1, CALLER_USER_HANDLE);
@@ -5377,6 +5384,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
    }



    @Test

    @Ignore("b/277916462")

    public void testResetPasswordWithToken() throws Exception {

        mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID;

        setupDeviceOwner();
@@ -5411,6 +5419,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
    }



    @Test

    @Ignore("b/277916462")

    public void resetPasswordWithToken_NumericPin() throws Exception {

        mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID;

        setupDeviceOwner();
@@ -5431,6 +5440,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
    }



    @Test

    @Ignore("b/277916462")

    public void resetPasswordWithToken_EmptyPassword() throws Exception {

        mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID;

        setupDeviceOwner();
@@ -7251,6 +7261,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
    }



    @Test

    @Ignore("b/277916462")

    public void testCanProfileOwnerResetPasswordWhenLocked() throws Exception {

        setDeviceEncryptionPerUser();

        setupProfileOwner();
@@ -7314,6 +7325,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
    }



    @Test

    @Ignore("b/277916462")

    public void testSetAccountTypesWithManagementDisabledOnManagedProfile() throws Exception {

        setupProfileOwner();
@@ -7333,6 +7345,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
    }



    @Test

    @Ignore("b/277916462")

    public void testSetAccountTypesWithManagementDisabledOnOrgOwnedManagedProfile()

            throws Exception {

        mContext.callerPermissions.add(permission.INTERACT_ACROSS_USERS);