Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 43032a4a28

Change-Id: I37d0c5f7a89b898fe918bb54fea243802eb48dc1
2020-02-24 10:21:44 +00:00
parent 3e09f3eecb 43032a4a28
commit 3aaa1ed859
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java
@@ -38,7 +38,8 @@ public class InstantAppDomainsPreferenceController extends AppInfoPreferenceCont

    @Override
    public int getAvailabilityStatus() {
-        return AppUtils.isInstant(mParent.getPackageInfo().applicationInfo)
+        return mParent.getPackageInfo() != null
+                && AppUtils.isInstant(mParent.getPackageInfo().applicationInfo)
                ? AVAILABLE : DISABLED_FOR_USER;
    }