commit a50630dd6855149883175e6bb2e62ea20d8ed6e4
author Sudheer Shanka <sudheersai@google.com> Fri May 26 22:47:51 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 26 22:47:56 2017 +0000
tree bdb115ccf0aeb42c62ab274307d1c7eaf8255c3e
parent bcb5bca1f3fd2dc54d088c3e2eae1c1c3a072718
parent e3b676763f0889c3f3202ca7dab94f927a24ad1f

Merge "Allow ManagedProvisioning to silently uninstall apps"

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

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 3086b38..cc6d51b 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -18,6 +18,7 @@
 
 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;
@@ -18475,6 +18476,14 @@
                 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;
     }