Merge "Tame the monkey. Bug #2547546" into froyo

2010-03-29 13:00:42 -07:00
parent 12cd8a3c27 7eec2bcf6f
commit 272b504ee6
1 changed files with 7 additions and 3 deletions
--- a/core/java/android/app/Dialog.java
+++ b/core/java/android/app/Dialog.java
@@ -236,10 +236,14 @@ public class Dialog implements DialogInterface, Window.Callback,
                    WindowManager.LayoutParams.SOFT_INPUT_IS_FORWARD_NAVIGATION;
            l = nl;
        }
-        mWindowManager.addView(mDecor, l);
-        mShowing = true;

-        sendShowMessage();
+        try {
+            mWindowManager.addView(mDecor, l);
+            mShowing = true;
+    
+            sendShowMessage();
+        } finally {
+        }
    }
    
    /**