summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2013-11-14 18:20:53 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-14 18:20:53 -0800
commit8d1e86d054c9d2a9bdec2a0c9d454ddf21768031 (patch)
tree029d4f2ffb0d00806056303fd20fa1585b8d043f /packages/Keyguard
parent2bced6dcb53c1743d6d11ffcb213206a07a63737 (diff)
parent1907c0d280d97776708810c9d24931aa6f818790 (diff)
downloadframeworks_base-8d1e86d054c9d2a9bdec2a0c9d454ddf21768031.zip
frameworks_base-8d1e86d054c9d2a9bdec2a0c9d454ddf21768031.tar.gz
frameworks_base-8d1e86d054c9d2a9bdec2a0c9d454ddf21768031.tar.bz2
am 1907c0d2: Merge "Don\'t show external presentation until keyguard actually shows" into klp-dev
* commit '1907c0d280d97776708810c9d24931aa6f818790': Don't show external presentation until keyguard actually shows
Diffstat (limited to 'packages/Keyguard')
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java8
1 files changed, 0 insertions, 8 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
index 91671e5..4086f84 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
@@ -618,14 +618,6 @@ public class KeyguardViewMediator {
}
}
KeyguardUpdateMonitor.getInstance(mContext).dispatchScreenTurndOff(why);
-
- // This needs to run on the UI thread
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- mKeyguardDisplayManager.show();
- }
- });
}
private void doKeyguardLaterLocked() {