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:
committed by
Android (Google) Code Review
commit
e1436695ef
@@ -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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user