From 93d9e26ffbbb6780dd2473cc395ae0a3481b4fd4 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Tue, 11 Aug 2015 15:02:42 -0400
Subject: [PATCH] Don't re-wrap alert dialog context

Bug: 23038618
Change-Id: Iafe3a45096153d9fe656ad930cc3978d8fab1968
---
 core/java/android/app/AlertDialog.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/app/AlertDialog.java b/core/java/android/app/AlertDialog.java
index abe12dcf9b766..782407262c198 100644
--- a/core/java/android/app/AlertDialog.java
+++ b/core/java/android/app/AlertDialog.java
@@ -1082,7 +1082,8 @@ public class AlertDialog extends Dialog implements DialogInterface {
          * create and display the dialog.
          */
         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);
             dialog.setCancelable(P.mCancelable);
             if (P.mCancelable) {