Merge "Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController" into rvc-dev am: bdf85c224b am: 0f8726124d am: 8590506c57" into rvc-qpr-dev-plus-aosp

This commit is contained in:
Automerger Merge Worker
2020-02-24 10:33:55 +00:00
committed by Android (Google) Code Review

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