From 99b22cba097bee6ff15c8a41cba38020fd182e94 Mon Sep 17 00:00:00 2001
From: lindatseng <lindatseng@google.com>
Date: Tue, 30 Apr 2019 14:13:32 -0700
Subject: [PATCH] Avoid NPE in app storage page

Adding null check for ProviderInfo. Skip adding count to map if
the Provider cannot be found, to avoid NPE.

Fixes: 128368170
Test: Manual
Change-Id: I3d3b5301e6ca25a671077c9b93ada89be46e23fd
---
 src/com/android/settings/applications/AppStorageSettings.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index 56fa4555fd1..f07c66cd8a5 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -421,6 +421,10 @@ public class AppStorageSettings extends AppInfoWithHeader
         for (GrantedUriPermission perm : perms) {
             String authority = perm.uri.getAuthority();
             ProviderInfo provider = pm.resolveContentProvider(authority, 0);
+            if (provider == null) {
+                continue;
+            }
+
             CharSequence app = provider.applicationInfo.loadLabel(pm);
             MutableInt count = uriCounters.get(app);
             if (count == null) {