diff options
author | Jim Miller <jaggies@google.com> | 2013-11-14 01:47:32 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-14 01:47:32 +0000 |
commit | 39af5a78c073d01539625a9fbbb8511747e2f048 (patch) | |
tree | 7551d41ecfc8905a624e337e34b22a3f9ce6731c /packages/Keyguard/src/com/android | |
parent | 4e04115052a66d5a7836c5e7a9bfc1a5d6f3784b (diff) | |
parent | 80cb9bcfc0088e268b310780d64b72f2df180ccd (diff) | |
download | frameworks_base-39af5a78c073d01539625a9fbbb8511747e2f048.zip frameworks_base-39af5a78c073d01539625a9fbbb8511747e2f048.tar.gz frameworks_base-39af5a78c073d01539625a9fbbb8511747e2f048.tar.bz2 |
Merge "Don't set up external displays from binder thread" into klp-dev
Diffstat (limited to 'packages/Keyguard/src/com/android')
-rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java index b65fcd8..3e247ab 100644 --- 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() { |