Merge "resolve merge conflicts of fc5c78e0ef79 to oc-dev-plus-aosp" into oc-dev-plus-aosp (f7abe1bf) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.server.pm;

		import static android.Manifest.permission.DELETE_PACKAGES;
		import static android.Manifest.permission.INSTALL_PACKAGES;
		import static android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS;
		import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
		import static android.Manifest.permission.REQUEST_DELETE_PACKAGES;
		import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
		@@ -18421,6 +18422,14 @@ public class PackageManagerService extends IPackageManager.Stub
		callingUid == getPackageUid(mStorageManagerPackage, 0, callingUserId)) {
		return true;
		}

		// Allow caller having MANAGE_PROFILE_AND_DEVICE_OWNERS permission to silently
		// uninstall for device owner provisioning.
		if (checkUidPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS, callingUid)
		== PERMISSION_GRANTED) {
		return true;
		}

		return false;
		}