Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e54e39be authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 4887033 - android.app.cts.AlertDialog_BuilderTest#testDisableCancelable"

parents ea380219 fbca7696

core/java/android/app/AlertDialog.java

+4 −1
Original line number Diff line number Diff line
@@ -890,7 +890,10 @@ public class AlertDialog extends Dialog implements DialogInterface { 
        public AlertDialog create() {

            final AlertDialog dialog = new AlertDialog(P.mContext, mTheme, false);

            P.apply(dialog.mAlert);

            dialog.setCanceledOnTouchOutside(P.mCancelable);

            dialog.setCancelable(P.mCancelable);

            if (P.mCancelable) {

                dialog.setCanceledOnTouchOutside(true);

            }

            dialog.setOnCancelListener(P.mOnCancelListener);

            if (P.mOnKeyListener != null) {

                dialog.setOnKeyListener(P.mOnKeyListener);