Merge "Return false if can't find package info"

2017-10-03 00:30:35 +00:00
parent 78922b8a75 883d8e7ed1
commit 13b500297d
2 changed files with 17 additions and 7 deletions
--- a/src/com/android/settings/applications/UsageAccessDetails.java
+++ b/src/com/android/settings/applications/UsageAccessDetails.java
@@ -137,9 +137,13 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc

    @Override
    protected boolean refreshUi() {
-        if (mPackageInfo == null) {
+        retrieveAppEntry();
+        if (mAppEntry == null) {
            return false;
        }
+        if (mPackageInfo == null) {
+            return false; // onCreate must have failed, make sure to exit
+        }
        mUsageState = mUsageBridge.getUsageInfo(mPackageName,
                mPackageInfo.applicationInfo.uid);