summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java11
1 files changed, 8 insertions, 3 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 440b779b8566..cf7a1a817391 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -10927,9 +10927,14 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
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");
}
}