From 8217a65de0105e610cd35a797c6dbfbee4aee95a Mon Sep 17 00:00:00 2001
From: Abhijeet Kaur <abkaur@google.com>
Date: Fri, 14 Feb 2020 15:48:14 +0000
Subject: [PATCH] Null Pointer check on ApplicationInfo object before invoking
 method

Test: builds
Change-Id: I53444e604b9c5eec79f824aadb4d7a8867cbef9e
---
 .../core/java/com/android/server/StorageManagerService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index b5b22f19d4262..66824566135fc 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -4030,7 +4030,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) {