Merge "Use API to check for the superivion component." into tm-dev (73276b3c) · Commits · e / os / android_packages_apps_Settings

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;