commit 642b3d453e5451ee61bf404cb76d51072b370642
author Abhijeet Kaur <abkaur@google.com> Mon Feb 17 17:10:50 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 17 17:10:50 2020 +0000
tree 9530bd770e7a45d9636b1503eaaea303a500f470
parent 6adc582d5d5b89ca2f9109f502e55dbf683d98f2
parent 8217a65de0105e610cd35a797c6dbfbee4aee95a

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

services/core/java/com/android/server/StorageManagerService.java

diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 033f63b..53dbb93 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -4095,7 +4095,7 @@
             if (!hasLegacy && !mIsFuseEnabled) {
                 ApplicationInfo ai = mIPackageManager.getApplicationInfo(packageName,
                         0, UserHandle.getUserId(uid));
-                hasLegacy = ai.hasRequestedLegacyExternalStorage();
+                hasLegacy = (ai != null && ai.hasRequestedLegacyExternalStorage());
             }
 
             if (hasLegacy && hasWrite) {