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

Commit 6e2ccc18 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Automerger Merge Worker
Browse files

Merge changes I7c63d523,Id0ac7d06 into udc-dev am: 132292ab 

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



Change-Id: I718ce1d5f7fba3f9eaf36f1a5ecf4e0fdf260e7d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fdab86e2 132292ab

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

+72 −15
Original line number Diff line number Diff line
@@ -13497,21 +13497,42 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            CallerIdentity caller, EnforcingAdmin admin, String key, boolean enabled,

            boolean parent) {

        synchronized (getLockObject()) {













            int ownerType;















            if (isDeviceOwner(caller)) {













                ownerType = OWNER_TYPE_DEVICE_OWNER;













            } else if (isProfileOwnerOfOrganizationOwnedDevice(caller)) {













                ownerType = OWNER_TYPE_PROFILE_OWNER_OF_ORGANIZATION_OWNED_DEVICE;













            } else if (isProfileOwner(caller)) {













                ownerType = OWNER_TYPE_PROFILE_OWNER;













            } else {













                throw new IllegalStateException("Non-DO/Non-PO cannot set restriction " + key













                        + " while targetSdkVersion is less than UPSIDE_DOWN_CAKE");













            }













            setBackwardCompatibleUserRestrictionLocked(ownerType, admin, caller.getUserId(), key,













                    enabled, parent);













        }













    }

























    private void setBackwardCompatibleUserRestrictionLocked(













            int ownerType, EnforcingAdmin admin, int userId, String key, boolean enabled,













            boolean parent) {













        if (ownerType == OWNER_TYPE_DEVICE_OWNER) {















            if (UserRestrictionsUtils.isGlobal(OWNER_TYPE_DEVICE_OWNER, key)) {















                setGlobalUserRestrictionInternal(admin, key, enabled);















            } else {













                    setLocalUserRestrictionInternal(admin, key, enabled, caller.getUserId());













                setLocalUserRestrictionInternal(admin, key, enabled, userId);















            }













            } else if (isProfileOwner(caller)) {













        } else if (ownerType == OWNER_TYPE_PROFILE_OWNER













                || ownerType == OWNER_TYPE_PROFILE_OWNER_OF_ORGANIZATION_OWNED_DEVICE) {















            if (UserRestrictionsUtils.isGlobal(OWNER_TYPE_PROFILE_OWNER, key)













                        || (parent && isProfileOwnerOfOrganizationOwnedDevice(caller)













                    || (parent && ownerType == OWNER_TYPE_PROFILE_OWNER_OF_ORGANIZATION_OWNED_DEVICE















                    && UserRestrictionsUtils.isGlobal(















                    OWNER_TYPE_PROFILE_OWNER_OF_ORGANIZATION_OWNED_DEVICE, key))) {















                setGlobalUserRestrictionInternal(admin, key, enabled);















            } else {















                int affectedUserId = parent













                            ? getProfileParentId(caller.getUserId()) : caller.getUserId();













                        ? getProfileParentId(userId) : userId;















                setLocalUserRestrictionInternal(admin, key, enabled, affectedUserId);















            }















        } else {









@@ -13519,7 +13540,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













                    + " while targetSdkVersion is less than UPSIDE_DOWN_CAKE");















        }















    }













    }





























    @Override















    public void setUserRestrictionGlobally(String callerPackage, String key) {










@@ -24206,6 +24226,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













        try {















            migrateScreenCapturePolicyLocked();















            migrateLockTaskPolicyLocked();













            migrateUserRestrictionsLocked();















            return true;















        } catch (Exception e) {















            Slogf.e(LOG_TAG, e, "Error occurred during post upgrade migration to the device "










@@ -24467,6 +24488,42 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













        });















    }



























    private void migrateUserRestrictionsLocked() {













        Binder.withCleanCallingIdentity(() -> {













            List<UserInfo> users = mUserManager.getUsers();













            for (UserInfo userInfo : users) {













                ActiveAdmin admin = getProfileOwnerOrDeviceOwnerLocked(userInfo.id);













                if (admin == null) continue;













                ComponentName adminComponent = admin.info.getComponent();













                int userId = userInfo.id;













                EnforcingAdmin enforcingAdmin = EnforcingAdmin.createEnterpriseEnforcingAdmin(













                        adminComponent,













                        userId,













                        admin);













                int ownerType;













                if (isDeviceOwner(admin)) {













                    ownerType = OWNER_TYPE_DEVICE_OWNER;













                } else if (isProfileOwnerOfOrganizationOwnedDevice(adminComponent, userId)) {













                    ownerType = OWNER_TYPE_PROFILE_OWNER_OF_ORGANIZATION_OWNED_DEVICE;













                } else if (isProfileOwner(adminComponent, userId)) {













                    ownerType = OWNER_TYPE_PROFILE_OWNER;













                } else {













                    throw new IllegalStateException("Invalid DO/PO state");













                }

























                for (final String restriction : admin.ensureUserRestrictions().keySet()) {













                    setBackwardCompatibleUserRestrictionLocked(ownerType, enforcingAdmin, userId,













                            restriction, /* enabled */ true, /* parent */ false);













                }













                for (final String restriction : admin.getParentActiveAdmin()













                        .ensureUserRestrictions().keySet()) {













                    setBackwardCompatibleUserRestrictionLocked(ownerType, enforcingAdmin, userId,













                            restriction, /* enabled */ true, /* parent */ true);













                }













            }













        });













    }



























    private List<PackageInfo> getInstalledPackagesOnUser(int userId) {















        return mInjector.binderWithCleanCallingIdentity(() ->















                mContext.getPackageManager().getInstalledPackagesAsUser(