Merge "Fix NPE in InstantAppButtonsPreferenceController"

This commit is contained in:
TreeHugger Robot
2018-02-23 06:53:32 +00:00
committed by Android (Google) Code Review
2 changed files with 13 additions and 3 deletions

View File

@@ -112,9 +112,10 @@ public class InstantAppButtonsPreferenceController extends BasePreferenceControl
@Override
public void onPrepareOptionsMenu(Menu menu) {
mInstallMenu = menu.findItem(AppInfoDashboardFragment.INSTALL_INSTANT_APP_MENU);
final Intent appStoreIntent = AppStoreUtil.getAppStoreLink(mContext, mPackageName);
if (appStoreIntent == null) {
mInstallMenu.setEnabled(false);
if (mInstallMenu != null) {
if (AppStoreUtil.getAppStoreLink(mContext, mPackageName) == null) {
mInstallMenu.setEnabled(false);
}
}
}