Merge "Avoid NPE in app storage page" into qt-dev am: 35efae7822

am: f51d1d234c Change-Id: Iaecb7a454e9a17660a82b0440f130089fad31675
2019-05-02 00:41:02 -07:00
parent 649294cb01 f51d1d234c
commit 6855d34ff6
1 changed files with 4 additions and 0 deletions
--- 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) {