Merge "Avoid NPE in app storage page" into qt-dev

am: 35efae7822 Change-Id: I09ab48b5d849e8c6c34551b1a8fabbe5530015b6
2019-05-01 22:49:08 -07:00
parent ac800b27b2 35efae7822
commit f51d1d234c
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) {