am 5305fe3f: am 39af5a78: Merge "Don\'t set up external displays from binder thread" into klp-dev

* commit '5305fe3f0971274d90d875cfbeffdb18e3b03f09':
  Don't set up external displays from binder thread

packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java

@@ -617,7 +617,14 @@ public class KeyguardViewMediator {
             }
         }
         KeyguardUpdateMonitor.getInstance(mContext).dispatchScreenTurndOff(why);
-        mKeyguardDisplayManager.show();
+
+        // This needs to run on the UI thread
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                mKeyguardDisplayManager.show();
+            }
+        });
     }
 
     private void doKeyguardLaterLocked() {