Merge "Null Pointer check on ApplicationInfo object before invoking method"

2020-02-17 17:10:50 +00:00
parent 6adc582d5d 8217a65de0
commit 642b3d453e
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -4095,7 +4095,7 @@ class StorageManagerService extends IStorageManager.Stub
            if (!hasLegacy && !mIsFuseEnabled) {
                ApplicationInfo ai = mIPackageManager.getApplicationInfo(packageName,
                        0, UserHandle.getUserId(uid));
-                hasLegacy = ai.hasRequestedLegacyExternalStorage();
+                hasLegacy = (ai != null && ai.hasRequestedLegacyExternalStorage());
            }

            if (hasLegacy && hasWrite) {