am 5a2dce60: am 50c1e5de: Merge "Update view on UI thread" into jb-mr1-dev

* commit '5a2dce6092c9686f285652da42ca8d0556b7b17d':
  Update view on UI thread

src/com/android/settings/wifi/WpsDialog.java

@@ -201,13 +201,16 @@ public class WpsDialog extends AlertDialog {
         }
     }
 
-    private void updateDialog(DialogState state, String msg) {
+    private void updateDialog(final DialogState state, final String msg) {
         if (mDialogState.ordinal() >= state.ordinal()) {
             //ignore.
             return;
         }
         mDialogState = state;
 
+        mHandler.post(new Runnable() {
+                @Override
+                public void run() {
                     switch(state) {
                         case WPS_COMPLETE:
                             mTimeoutBar.setVisibility(View.GONE);
@@ -226,6 +229,8 @@ public class WpsDialog extends AlertDialog {
                     }
                     mTextView.setText(msg);
                 }
+            });
+   }
 
     private void handleEvent(Context context, Intent intent) {
         String action = intent.getAction();