From fbca76965b96b31a8974e461ee1929867ef3327b Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Wed, 22 Jun 2011 21:29:19 -0700
Subject: Fix bug 4887033 -
 android.app.cts.AlertDialog_BuilderTest#testDisableCancelable

Change-Id: I659201124c4c6730046be55a918c64ca57a9f4db
---
 core/java/android/app/AlertDialog.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/java/android/app/AlertDialog.java b/core/java/android/app/AlertDialog.java
index 7a465c1..491fcfe 100644
--- a/core/java/android/app/AlertDialog.java
+++ b/core/java/android/app/AlertDialog.java
@@ -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);
-- 
cgit v1.1