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

Commit bb03bf05 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev 

* commit '105febd2':
  Don't re-wrap alert dialog context
parents bfd62580 105febd2

core/java/android/app/AlertDialog.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -1082,7 +1082,8 @@ public class AlertDialog extends Dialog implements DialogInterface { 
         * create and display the dialog.

         * create and display the dialog.

         */

         */

        public AlertDialog create() {

        public AlertDialog create() {

            final AlertDialog dialog = new AlertDialog(P.mContext);

            // Context has already been wrapped with the appropriate theme.

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

            P.apply(dialog.mAlert);

            P.apply(dialog.mAlert);

            dialog.setCancelable(P.mCancelable);

            dialog.setCancelable(P.mCancelable);

            if (P.mCancelable) {

            if (P.mCancelable) {