From 4a9c108b286b586e8a0df98ec67ca774f68b3a3d Mon Sep 17 00:00:00 2001 From: Jason Parks Date: Thu, 9 Jun 2022 16:35:26 +0000 Subject: [PATCH] Use API to check for the superivion component. Bug: 219025233 Test: manual Change-Id: Icd2593a67ae0297340991a5375b18e2f933facb1 --- .../deviceadmin/DeviceAdminAdd.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java index 7dbf3338ddb..fa76a948c06 100644 --- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java +++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java @@ -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;