Merge "Proper fix for setDeviceOwner() permission check." into sc-v2-dev (f70489f2) · Commits · e / os / android_frameworks_base

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

+14 −12

Original line number	Diff line number	Diff line
		@@ -10632,6 +10632,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		}
		}
		final String adminPkg = admin.getPackageName();
		mInjector.binderWithCleanCallingIdentity(() -> {
		try {
		// Install the profile owner if not present.
		if (!mIPackageManager.isPackageAvailable(adminPkg, userId)) {
		@@ -10645,6 +10646,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		Slogf.wtf(LOG_TAG, e, "Failed to install admin package %s for user %d",
		adminPkg, userId);
		}
		});

		// Set admin.
		setActiveAdmin(profileOwner, /* refreshing= */ true, userId);