Fix issue with blank screen and grouped permissions. (fe1c7b9d) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/packageinstaller/permission/ui/GrantPermissionsWatchViewHandler.java

+36 −53

Original line number	Original line	Diff line number	Diff line
	@@ -119,16 +119,12 @@ final class GrantPermissionsWatchViewHandler implements GrantPermissionsViewHand
	Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);		Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
	}		}

	if (mShowDoNotAsk) {
	if (mDialog instanceof AlertDialog) {
	AlertDialog alertDialog = (AlertDialog) mDialog;
	alertDialog.setTitle(ssb);
	alertDialog.setIcon(drawable);
	} else {
	if (mDialog != null) {		if (mDialog != null) {
	mDialog.dismiss();		mDialog.dismiss();
	mDialog = null;		mDialog = null;
	}		}

			if (mShowDoNotAsk) {
	AlertDialog alertDialog = new WearableDialogHelper.DialogBuilder(mContext)		AlertDialog alertDialog = new WearableDialogHelper.DialogBuilder(mContext)
	.setPositiveIcon(R.drawable.confirm_button)		.setPositiveIcon(R.drawable.confirm_button)
	.setNeutralIcon(R.drawable.cancel_button)		.setNeutralIcon(R.drawable.cancel_button)
	@@ -139,7 +135,6 @@ final class GrantPermissionsWatchViewHandler implements GrantPermissionsViewHand
	.setNeutralButton(R.string.grant_dialog_button_deny, this)		.setNeutralButton(R.string.grant_dialog_button_deny, this)
	.setNegativeButton(R.string.grant_dialog_button_deny_dont_ask_again, this)		.setNegativeButton(R.string.grant_dialog_button_deny_dont_ask_again, this)
	.show();		.show();
	alertDialog.setCancelable(false);
	alertDialog.getButton(DialogInterface.BUTTON_POSITIVE)		alertDialog.getButton(DialogInterface.BUTTON_POSITIVE)
	.setId(R.id.permission_allow_button);		.setId(R.id.permission_allow_button);
	alertDialog.getButton(DialogInterface.BUTTON_NEUTRAL)		alertDialog.getButton(DialogInterface.BUTTON_NEUTRAL)
	@@ -148,18 +143,7 @@ final class GrantPermissionsWatchViewHandler implements GrantPermissionsViewHand
	.setId(R.id.permission_deny_dont_ask_again_button);		.setId(R.id.permission_deny_dont_ask_again_button);

	mDialog = alertDialog;		mDialog = alertDialog;
	}
	} else {
	if (mDialog instanceof AcceptDenyDialog) {
	AcceptDenyDialog acceptDenyDialog = (AcceptDenyDialog) mDialog;
	acceptDenyDialog.setTitle(ssb);
	acceptDenyDialog.setIcon(drawable);
	} else {		} else {
	if (mDialog != null) {
	mDialog.dismiss();
	mDialog = null;
	}

	AcceptDenyDialog acceptDenyDialog = new AcceptDenyDialog(mContext);		AcceptDenyDialog acceptDenyDialog = new AcceptDenyDialog(mContext);
	acceptDenyDialog.setTitle(ssb);		acceptDenyDialog.setTitle(ssb);
	acceptDenyDialog.setIcon(drawable);		acceptDenyDialog.setIcon(drawable);
	@@ -172,9 +156,8 @@ final class GrantPermissionsWatchViewHandler implements GrantPermissionsViewHand
	.setId(R.id.permission_deny_button);		.setId(R.id.permission_deny_button);

	mDialog = acceptDenyDialog;		mDialog = acceptDenyDialog;
	mDialog.setCancelable(false);
	}
	}		}
			mDialog.setCancelable(false);

	if (savedInstanceState != null) {		if (savedInstanceState != null) {
	mDialog.onRestoreInstanceState(savedInstanceState);		mDialog.onRestoreInstanceState(savedInstanceState);