commit deae24674d74c96f71c7e817bea3d2685a2f052f
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 05 15:49:53 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 05 15:49:53 2020 +0000
tree 2c9feb99d18488eb1879708e1e6aa88cf72f22b8
parent fc1430a39e6a41afbd5736292c56c1e8a4406612
parent fff2595d2a28f26501a9a61201e0679e8544aa27

Merge "Fix leaks of personal apps in setApplicationHidden" into rvc-dev

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 2a34bbe..1de704d 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -10912,9 +10912,14 @@
 
     private void enforcePackageIsSystemPackage(String packageName, int userId)
             throws RemoteException {
-        if (!isSystemApp(mIPackageManager, packageName, userId)) {
-            throw new IllegalArgumentException(
-                    "The provided package is not a system package");
+        boolean isSystem;
+        try {
+            isSystem = isSystemApp(mIPackageManager, packageName, userId);
+        } catch (IllegalArgumentException e) {
+            isSystem = false;
+        }
+        if (!isSystem) {
+            throw new IllegalArgumentException("The provided package is not a system package");
         }
     }