Merge "Don't set up external displays from binder thread" into klp-dev

2013-11-14 01:47:32 +00:00
parent 4e04115052 80cb9bcfc0
commit 39af5a78c0
1 changed files with 8 additions and 1 deletions
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
+++ b/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() {