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

Commit ba6752d6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Consolidate checking of superivsion configs." into tm-dev am:... 

Merge "Consolidate checking of superivsion configs." into tm-dev am: 58bda6d5 am: 3099215b am: e432522c

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



Change-Id: Ia5264bf3d4b2398c5955087c3ec127621875b6dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5c37919e e432522c

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

+32 −49
Original line number Diff line number Diff line
@@ -9290,22 +9290,39 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                    return poComponent;

                }

            }

            final String supervisor = mContext.getResources().getString(

                    com.android.internal.R.string.config_defaultSupervisionProfileOwnerComponent);

            if (supervisor == null) {

                return null;













            // Check profile owner first as that is what most likely is set.













            if (isSupervisionComponent(poComponent)) {













                return poComponent;















            }













            final ComponentName supervisorComponent = ComponentName.unflattenFromString(supervisor);













            if (supervisorComponent == null) {













                return null;

























            if (isSupervisionComponent(doComponent)) {













                return doComponent;















            }













            if (supervisorComponent.equals(doComponent) || supervisorComponent.equals(













                    poComponent)) {













                return supervisorComponent;













            } else {



























            return null;















        }















    }

























    private boolean isSupervisionComponent(@Nullable ComponentName who) {













        if (who == null) {













            return false;













        }

























        final String configComponent = mContext.getResources().getString(













                com.android.internal.R.string.config_defaultSupervisionProfileOwnerComponent);













        if (configComponent != null) {













            final ComponentName componentName = ComponentName.unflattenFromString(configComponent);













            if (who.equals(componentName)) {













                return true;













            }













        }

























        // Check the system supervision role.













        final String configPackage = mContext.getResources().getString(













                com.android.internal.R.string.config_systemSupervision);

























        return who.getPackageName().equals(configPackage);















    }





























    @Override










@@ -9491,22 +9508,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













                    "Cannot set the profile owner on a user which is already set-up");





























            if (!mIsWatch) {













                final String supervisionRolePackage = mContext.getResources().getString(













                        com.android.internal.R.string.config_systemSupervision);













                // Only the default supervision profile owner or supervision role holder













                // can be set as profile owner after SUW













                final String supervisor = mContext.getResources().getString(













                        com.android.internal.R.string













                                .config_defaultSupervisionProfileOwnerComponent);













                if (supervisor == null && supervisionRolePackage == null) {













                    throw new IllegalStateException("Unable to set profile owner post-setup, no"













                            + "default supervisor profile owner defined");













                }

























                final ComponentName supervisorComponent = ComponentName.unflattenFromString(













                        supervisor);













                if (!owner.equals(supervisorComponent)













                        && !owner.getPackageName().equals(supervisionRolePackage)) {













                if (!isSupervisionComponent(owner)) {















                    throw new IllegalStateException("Unable to set non-default profile owner"















                            + " post-setup " + owner);















                }










@@ -12100,7 +12102,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













        synchronized (getLockObject()) {















            // Allow testOnly admins to bypass supervision config requirement.















            Preconditions.checkCallAuthorization(isAdminTestOnlyLocked(who, caller.getUserId())













                    || isDefaultSupervisor(caller), "Admin %s is not the "













                    || isSupervisionComponent(caller.getComponentName()), "Admin %s is not the "















                    + "default supervision component", caller.getComponentName());















            DevicePolicyData policy = getUserData(caller.getUserId());















            policy.mSecondaryLockscreenEnabled = enabled;









@@ -12119,16 +12121,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













        return isProfileOwner(caller) && isManagedProfile(caller.getUserId());















    }



























    private boolean isDefaultSupervisor(CallerIdentity caller) {













        final String supervisor = mContext.getResources().getString(













                com.android.internal.R.string.config_defaultSupervisionProfileOwnerComponent);













        if (supervisor == null) {













            return false;













        }













        final ComponentName supervisorComponent = ComponentName.unflattenFromString(supervisor);













        return caller.getComponentName().equals(supervisorComponent);













    }



























    @Override















    public void setPreferentialNetworkServiceConfigs(















            List<PreferentialNetworkServiceConfig> preferentialNetworkServiceConfigs) {










@@ -13012,16 +13004,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













                    return false;















                }



























                final String supervisionString = mContext.getResources().getString(













                        com.android.internal.R.string













                                .config_defaultSupervisionProfileOwnerComponent);













                if (supervisionString == null) {













                    return false;













                }

























                final ComponentName supervisorComponent = ComponentName.unflattenFromString(













                        supervisionString);













                return admin.info.getComponent().equals(supervisorComponent);













                return isSupervisionComponent(admin.info.getComponent());















            }















        }







































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



+38
−9




























Original line number
Diff line number
Diff line








@@ -3322,19 +3322,48 @@ public class DevicePolicyManagerTest extends DpmTestBase {













    }































    @Test













    public void testIsActiveSupervisionApp() throws Exception {













        when(mServiceContext.resources













                .getString(R.string.config_defaultSupervisionProfileOwnerComponent))













                .thenReturn(admin1.flattenToString());













    public void testSupervisionConfig() throws Exception {













        final int uid = UserHandle.getUid(15, 19436);













        addManagedProfile(admin1, uid, admin1);













        mContext.binder.callingUid = uid;





























        final int PROFILE_USER = 15;













        final int PROFILE_ADMIN = UserHandle.getUid(PROFILE_USER, 19436);













        addManagedProfile(admin1, PROFILE_ADMIN, admin1);













        mContext.binder.callingUid = PROFILE_ADMIN;













        verifySupervisionConfig(uid, null, null);













        verifySupervisionConfig(uid, "", null);













        verifySupervisionConfig(uid, null, "");













        verifySupervisionConfig(uid, "", "");



























        verifySupervisionConfig(uid, admin1.flattenToString(), null);













        verifySupervisionConfig(uid, admin1.flattenToString(), "");



























        verifySupervisionConfig(uid, null, admin1.getPackageName());













        verifySupervisionConfig(uid, "", admin1.getPackageName());













    }



























    private void verifySupervisionConfig(













            int uid , String configComponentName, String configPackageName) {













        final boolean isAdmin = admin1.flattenToString().equals(configComponentName)













                || admin1.getPackageName().equals(configPackageName);





























        final UserHandle user = UserHandle.getUserHandleForUid(uid);















        final DevicePolicyManagerInternal dpmi =















                LocalServices.getService(DevicePolicyManagerInternal.class);













        assertThat(dpmi.isActiveSupervisionApp(PROFILE_ADMIN)).isTrue();



























        when(mServiceContext.resources













                .getString(R.string.config_defaultSupervisionProfileOwnerComponent))













                .thenReturn(configComponentName);



























        when(mServiceContext.resources













                .getString(R.string.config_systemSupervision))













                .thenReturn(configPackageName);



























        if (isAdmin) {













            assertThat(dpmi.isActiveSupervisionApp(uid)).isTrue();













            assertThat(dpm.getProfileOwnerOrDeviceOwnerSupervisionComponent(user))













                        .isEqualTo(admin1);













        } else {













            assertThat(dpmi.isActiveSupervisionApp(uid)).isFalse();













            assertThat(dpm.getProfileOwnerOrDeviceOwnerSupervisionComponent(user)).isNull();













        }















    }































    // Test if lock timeout on managed profile is handled correctly depending on whether profile