commit 975ee1f25a58e1f5f636248c0b51851767ccc14b
author Sudheer Shanka <sudheersai@google.com> Thu May 25 19:17:44 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 25 19:17:48 2017 +0000
tree 3ce4e8e769d03065c7742aed849e0dcf2c765f38
parent 0995b177ab0dc35eae1f54e2d73e45e2d0ce7813
parent d8e7206d942ada63cd3c1bb5dff2def35033ad91

Merge "[PackageManagerService]:Fix system app can't uninstall apps silently" into oc-dev

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 1b32a93..3ff91ef 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -18371,7 +18371,7 @@
 
     private boolean isCallerAllowedToSilentlyUninstall(int callingUid, String pkgName) {
         if (callingUid == Process.SHELL_UID || callingUid == Process.ROOT_UID
-              || callingUid == Process.SYSTEM_UID) {
+              || UserHandle.getAppId(callingUid) == Process.SYSTEM_UID) {
             return true;
         }
         final int callingUserId = UserHandle.getUserId(callingUid);