commit adafc9cb0ffcbf534e2b540f215d059e4de327b0
author Oli Lan <olilan@google.com> Wed Aug 24 13:37:04 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 24 13:37:04 2022 +0000
tree 4fe869caacea951d5f38fbb84542bb3020ecb420
parent c2d264989a2c18af9e3f210f62eba8d987fefb5b
parent 7fdc96aef4e098d2271ac3a8557bd8e1ad6827f3

Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-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 238b0a9..5161b9f 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -18687,6 +18687,17 @@
                 return PackageManager.DELETE_FAILED_INTERNAL_ERROR;
             }
 
+            if (isSystemApp(uninstalledPs)
+                    && (deleteFlags & PackageManager.DELETE_SYSTEM_APP) == 0) {
+                UserInfo userInfo = sUserManager.getUserInfo(userId);
+                if (userInfo == null || !userInfo.isAdmin()) {
+                    Slog.w(TAG, "Not removing package " + packageName
+                            + " as only admin user may downgrade system apps");
+                    EventLog.writeEvent(0x534e4554, "170646036", -1, packageName);
+                    return PackageManager.DELETE_FAILED_USER_RESTRICTED;
+                }
+            }
+
             disabledSystemPs = mSettings.getDisabledSystemPkgLPr(packageName);
             // Save the enabled state before we delete the package. When deleting a stub
             // application we always set the enabled state to 'disabled'.