Merge "Fix NPE crash in UsageAccessDetails" am: cd959f28a0 am: 296c46404c

am: c13415391b

Change-Id: I8e5050b2b4c5884b93ef56155f50d1fffcc13579

src/com/android/settings/applications/AppInfoBase.java

@@ -218,7 +218,9 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
 
     @Override
     public void onPackageListChanged() {
-        refreshUi();
+        if (!refreshUi()) {
+            setIntentAndFinish(true, true);
+        }
     }
 
     public static void startAppInfoFragment(Class<?> fragment, int titleRes,

src/com/android/settings/applications/UsageAccessDetails.java

@@ -137,6 +137,9 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc
 
     @Override
     protected boolean refreshUi() {
+        if (mPackageInfo == null) {
+            return false;
+        }
         mUsageState = mUsageBridge.getUsageInfo(mPackageName,
                 mPackageInfo.applicationInfo.uid);