From c56ce8d647b35cb7b9bc9a502eb98fa96901e63b Mon Sep 17 00:00:00 2001
From: Jason Chiu <chiujason@google.com>
Date: Fri, 21 Feb 2020 17:06:03 +0800
Subject: [PATCH] Guard NPE in getAvailabilityStatus of
 InstantAppDomainsPreferenceController

Fixes: 149373695
Test: build, manual
Change-Id: I7501ef393e226bb38c72a1ee465bf9c72586716b
Merged-In: I7501ef393e226bb38c72a1ee465bf9c72586716b
(cherry picked from commit c0543e833f4dd0ef0165d7b490e68fba73df097c)
---
 .../appinfo/InstantAppDomainsPreferenceController.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java
index cbb805f3554..34c67f13590 100644
--- 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;
     }