From 0fc9f5ef313dd685cf152d9cc80f966d06f2d567 Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Fri, 14 Feb 2020 19:46:40 +0100
Subject: [PATCH] Check for null ApplicationInfo object in SMS.

Bug: 149448096
Test: builds
Change-Id: I783c35323ecb82721b47c1d97e211b93a2ec0d48
---
 .../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 c9ba988000e04..30ed26274770b 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -3973,7 +3973,7 @@ class StorageManagerService extends IStorageManager.Stub
             if (mIsFuseEnabled && hasMtp) {
                 ApplicationInfo ai = mIPackageManager.getApplicationInfo(packageName,
                         0, UserHandle.getUserId(uid));
-                if (ai.isSignedWithPlatformKey()) {
+                if (ai != null && ai.isSignedWithPlatformKey()) {
                     // Platform processes hosting the MTP server should be able to write in Android/
                     return Zygote.MOUNT_EXTERNAL_ANDROID_WRITABLE;
                 }