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

Merge "resolve merge conflicts of fc5c78e0ef to oc-dev-plus-aosp" into oc-dev-plus-aosp

Browse Source
This commit is contained in:
Todd Kennedy
2017-05-30 23:28:55 +00:00
committed by Android (Google) Code Review
parent d463c15584 832267afca
commit f7abe1bf9b
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

@@ -18,6 +18,7 @@ package com.android.server.pm;
import static android.Manifest.permission.DELETE_PACKAGES; import static android.Manifest.permission.DELETE_PACKAGES;
import static android.Manifest.permission.INSTALL_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.READ_EXTERNAL_STORAGE;
import static android.Manifest.permission.REQUEST_DELETE_PACKAGES; import static android.Manifest.permission.REQUEST_DELETE_PACKAGES;
import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE; import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
@@ -18421,6 +18422,14 @@ public class PackageManagerService extends IPackageManager.Stub
callingUid == getPackageUid(mStorageManagerPackage, 0, callingUserId)) { callingUid == getPackageUid(mStorageManagerPackage, 0, callingUserId)) {
return true; 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; return false;
} }