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

Commit 9099d356 authored by Michael Wachenschwanz's avatar Michael Wachenschwanz Committed by android-build-merger
Browse files

Merge "Add a resource config to define a default supervision component." into qt-dev 

am: 7446be3f

Change-Id: I052781ce1f86eb3d5a70f8fda5390de1bbbe36f1
parents 14b584b5 7446be3f

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -4087,4 +4087,8 @@ 
    <integer-array name="config_face_acquire_vendor_biometricprompt_ignorelist" translatable="false" >

    </integer-array>



    <!-- The component name for the default profile supervisor, which can be set as a profile owner

    even after user setup is complete. The defined component should be used for supervision purposes

    only. The component must be part of a system app. -->

    <string name="config_defaultSupervisionProfileOwnerComponent" translatable="false"></string>

</resources>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -3781,4 +3781,6 @@ 
  <java-symbol type="dimen" name="chooser_direct_share_label_placeholder_max_width" />

  <java-symbol type="layout" name="chooser_az_label_row" />

  <java-symbol type="string" name="chooser_all_apps_button_label" />



  <java-symbol type="string" name="config_defaultSupervisionProfileOwnerComponent" />

</resources>

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

+25 −3
Original line number Diff line number Diff line
@@ -8034,6 +8034,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
            throw new IllegalArgumentException("Component " + who

                    + " not installed for userId:" + userHandle);

        }















        final boolean hasIncompatibleAccountsOrNonAdb =















                hasIncompatibleAccountsOrNonAdbNoLock(userHandle, who);















        synchronized (getLockObject()) {










@@ -8539,10 +8540,31 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













            return;















        }















        enforceCanManageProfileAndDeviceOwners();













        if ((mIsWatch || hasUserSetupCompleted(userHandle)) && !isCallerWithSystemUid()) {

























        if ((mIsWatch || hasUserSetupCompleted(userHandle))) {













            if (!isCallerWithSystemUid()) {















                throw new IllegalStateException("Cannot set the profile owner on a user which is "















                        + "already set-up");















            }

























            if (!mIsWatch) {













                // Only the default supervision profile owner can be set as profile owner after SUW













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













                        com.android.internal.R.string













                                .config_defaultSupervisionProfileOwnerComponent);













                if (supervisor == 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)) {













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













                            + " post-setup " + owner);













                }













            }













        }















    }





























    /**