Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 0f8726124d

Change-Id: I9248812c45717a9391e2a886b74af5c651234cd7
This commit is contained in:
Automerger Merge Worker
2020-02-24 10:21:47 +00:00

View File

@@ -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;
}