Merge "Guard NPE in getAvailabilityStatus of InstantAppDomainsPreferenceController"

This commit is contained in:
TreeHugger Robot
2020-02-22 10:24:51 +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;
}