Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow ManagedProvisioning to silently uninstall apps" am: cfc68b6661

Browse Source 
am: 6683494c94

Change-Id: I9f0092630e3b89f708b3f157e1c36052297458db
This commit is contained in:
insight.lee
2017-05-30 22:41:56 +00:00
committed by android-build-merger
parent 26d6431106 6683494c94
commit fc5c78e0ef
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -16,6 +16,7 @@
package com.android.server.pm;
import static android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS;
import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
import static android.Manifest.permission.WRITE_MEDIA_STORAGE;
@@ -15645,6 +15646,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;
}