Merge "Don't check whether dismiss() is called on the UI thread Bug #6436642" into jb-dev

Author: Romain Guy

core/java/android/app/Dialog.java

@@ -103,7 +103,6 @@ public class Dialog implements DialogInterface, Window.Callback,
     private boolean mShowing = false;
     private boolean mCanceled = false;
 
-    private final Thread mUiThread;
     private final Handler mHandler = new Handler();
 
     private static final int DISMISS = 0x43;
@@ -162,7 +161,6 @@ public Dialog(Context context, int theme) {
         w.setCallback(this);
         w.setWindowManager(mWindowManager, null, null);
         w.setGravity(Gravity.CENTER);
-        mUiThread = Thread.currentThread();
         mListenersHandler = new ListenersHandler(this);
     }
 
@@ -299,12 +297,7 @@ public void hide() {
      * that in {@link #onStop}.
      */
     public void dismiss() {
-        if (Thread.currentThread() != mUiThread) {
-            mHandler.post(mDismissAction);
-        } else {
-            mHandler.removeCallbacks(mDismissAction);
-            mDismissAction.run();
-        }
+        mHandler.post(mDismissAction);
     }
 
     void dismissDialog() {