diff options
| author | Adrian Roos <roosa@google.com> | 2015-04-23 15:19:45 -0700 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2015-04-23 22:22:36 +0000 |
| commit | d322f1af916038816ef2a5b56fef4d9648d8433e (patch) | |
| tree | d4d8ed421ae6c0da7ed09c9e241f4c1e199d9f00 /packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java | |
| parent | 3acf4f5c91377457ec04bd2dca172fbfcd859b92 (diff) | |
| download | frameworks_base-d322f1af916038816ef2a5b56fef4d9648d8433e.zip frameworks_base-d322f1af916038816ef2a5b56fef4d9648d8433e.tar.gz frameworks_base-d322f1af916038816ef2a5b56fef4d9648d8433e.tar.bz2 | |
Fix disappearing status bar icons with SHOW_WHEN_LOCKED
Fixes a bug where launching a SHOW_WHEN_LOCKED window from the bouncer
wouldn't properly restore PhoneStatusBar's state leading to missing
status bar icons.
Bug: 20474073
Change-Id: Ib22dc0dc5a89214af8876ddaea52569e2e24a742
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 194a19a..0caf51a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -145,6 +145,7 @@ public class StatusBarKeyguardViewManager { if (mShowing) { if (mOccluded) { mPhoneStatusBar.hideKeyguard(); + mPhoneStatusBar.stopWaitingForKeyguardExit(); mBouncer.hide(false /* destroyView */); } else { showBouncerOrKeyguard(); |