commit 99b22cba097bee6ff15c8a41cba38020fd182e94
author lindatseng <lindatseng@google.com> Tue Apr 30 14:13:32 2019 -0700
committer Linda Tseng <lindatseng@google.com> Wed May 01 01:27:25 2019 +0000
tree 4fe4da7823871038fbf5d3b71c96ce5eb20c1cab
parent 30d0e6c7d750e3394504484d7440841dfe9b60dc

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

diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index 56fa455..f07c66c 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -421,6 +421,10 @@
         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) {