Check for null callerPackage in getStorageEncryptionStatus

* This function assumes that callerPackage is always valid, even though the parameter is annotated nullable. Check and assume the function was called by the system if the callerPackage was null. Change-Id: Ie936d401f666ac8022635fb49d9ab2adfb5916c4 Signed-off-by: Akhil Narang <[email protected]>
framework-res · Sep 25, 2020 · 8e70e9d · 8e70e9d
1 parent 21cca08
commit 8e70e9d
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -7866,20 +7866,24 @@ public int getStorageEncryptionStatus(@Nullable String callerPackage, int userHa
         }
         enforceFullCrossUsersPermission(userHandle);
 
-        // It's not critical here, but let's make sure the package name is correct, in case
-        // we start using it for different purposes.
-        ensureCallerPackage(callerPackage);
-
-        final ApplicationInfo ai;
-        try {
-            ai = mIPackageManager.getApplicationInfo(callerPackage, 0, userHandle);
-        } catch (RemoteException e) {
-            throw new SecurityException(e);
-        }
-
         boolean legacyApp = false;
-        if (ai.targetSdkVersion <= Build.VERSION_CODES.M) {
-            legacyApp = true;
+        // callerPackage can only be null if we were called from within the system,
+        // which means that we are not a legacy app.
+        if (callerPackage != null) {
+            // It's not critical here, but let's make sure the package name is correct, in case
+            // we start using it for different purposes.
+            ensureCallerPackage(callerPackage);
+
+            final ApplicationInfo ai;
+            try {
+                ai = mIPackageManager.getApplicationInfo(callerPackage, 0, userHandle);
+            } catch (RemoteException e) {
+                throw new SecurityException(e);
+            }
+
+            if (ai.targetSdkVersion <= Build.VERSION_CODES.M) {
+                legacyApp = true;
+            }
         }
 
         final int rawStatus = getEncryptionStatus();