Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832
Change-Id: I7d5be03e04e9c500bfdaef61dfef5699288dbd98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
index 7dbf333..fa76a94 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 @@
// 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;