diff options
author | Tim Kilbourn <tkilbourn@google.com> | 2014-12-12 18:50:10 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-12 18:50:10 +0000 |
commit | d91985cd4306ad3d9f422a7392bc8513f6c59e07 (patch) | |
tree | 8adae12cb58fd481bb17db50f6cbc8af6659a47e | |
parent | 746079e2ee516d1c7be62154992eda78e9f2ec28 (diff) | |
parent | 2636ccc1857264a76db8ddaee600f06fadad3c36 (diff) | |
download | frameworks_base-d91985cd4306ad3d9f422a7392bc8513f6c59e07.zip frameworks_base-d91985cd4306ad3d9f422a7392bc8513f6c59e07.tar.gz frameworks_base-d91985cd4306ad3d9f422a7392bc8513f6c59e07.tar.bz2 |
am 2636ccc1: Merge "Revert "Attempt to fix keyguard missing bug"" into lmp-mr1-dev
* commit '2636ccc1857264a76db8ddaee600f06fadad3c36':
Revert "Attempt to fix keyguard missing bug"
-rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java index e499299..618ba1e 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java @@ -37,7 +37,6 @@ public class KeyguardServiceDelegate { private final Context mContext; private final View mScrim; // shown if keyguard crashes private final KeyguardState mKeyguardState = new KeyguardState(); - private ShowListener mShowListenerWhenConnect; /* package */ static final class KeyguardState { KeyguardState() { @@ -131,13 +130,7 @@ public class KeyguardServiceDelegate { // If the system is ready, it means keyguard crashed and restarted. mKeyguardService.onSystemReady(); // This is used to hide the scrim once keyguard displays. - mKeyguardService.onScreenTurnedOn(new KeyguardShowDelegate( - mShowListenerWhenConnect)); - if (mShowListenerWhenConnect != null) { - Log.v(TAG, "*** hiding scrim because keyguard wasn't ready"); - mShowListenerWhenConnect = null; - hideScrim(); - } + mKeyguardService.onScreenTurnedOn(new KeyguardShowDelegate(null)); } if (mKeyguardState.bootCompleted) { mKeyguardService.onBootCompleted(); @@ -219,10 +212,9 @@ public class KeyguardServiceDelegate { } else { // try again when we establish a connection Slog.w(TAG, "onScreenTurnedOn(): no keyguard service!"); - // This shouldn't happen, but if it does, show the scrim immediately and - // invoke the listener's callback after the service actually connects. - mShowListenerWhenConnect = showListener; - showScrim(); + // This shouldn't happen, but if it does, invoke the listener immediately + // to avoid a dark screen... + showListener.onShown(null); } mKeyguardState.screenIsOn = true; } @@ -288,6 +280,7 @@ public class KeyguardServiceDelegate { lp.setTitle("KeyguardScrim"); WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); wm.addView(view, lp); + view.setVisibility(View.GONE); // Disable pretty much everything in statusbar until keyguard comes back and we know // the state of the world. view.setSystemUiVisibility(View.STATUS_BAR_DISABLE_HOME |