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

Commit 6d2ab0c6 authored by Jason Parks's avatar Jason Parks Committed by Automerger Merge Worker
Browse files

Merge "Use API to check for the superivion component." into tm-dev am:... 

Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c am: 3b6fe081 am: 3f55cd89

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832



Change-Id: I73c85f36f4edde7719e9d12ead4c10e919629a8e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f33d7a7 3f55cd89

src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java

+1 −15
Original line number Diff line number Diff line
@@ -313,21 +313,7 @@ public class DeviceAdminAdd extends CollapsingToolbarBaseActivity { 


            // otherwise, only the defined default supervision profile owner or holder of

            // supersvision role can be set after user setup.

            final String supervisor = getString(

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

            final String supervisionRolePackage = getString(

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

            if (TextUtils.isEmpty(supervisor) && TextUtils.isEmpty(supervisionRolePackage)) {

                Log.w(TAG, "Unable to set profile owner post-setup, no default supervisor"

                        + "profile owner defined");

                finish();

                return;

            }



            final ComponentName supervisorComponent = ComponentName.unflattenFromString(

                    supervisor);

            if (!who.equals(supervisorComponent)

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

            if (!mDPM.isSupervisionComponent(who)) {

                Log.w(TAG, "Unable to set non-default profile owner post-setup " + who);

                finish();

                return;