From 26e8fc012a6eed3107c40dae5fb25cc347f6454a Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Wed, 13 Jul 2016 19:06:24 -0700 Subject: [PATCH] Fix bug where swiping on the fp sensor when the screen is off causes blank screen Fixes bug 29834150 Change-Id: Idcb45a9e9cff9313f737a6896bfbb54b3bfc1472 --- .../com/android/systemui/statusbar/phone/PhoneStatusBar.java | 2 +- .../android/systemui/statusbar/policy/KeyguardMonitor.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index fb7afc59b276b..482c698bab873 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -2586,7 +2586,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, @Override public void handleSystemNavigationKey(int key) { if (SPEW) Log.d(TAG, "handleSystemNavigationKey: " + key); - if (!panelsEnabled()) { + if (!panelsEnabled() || !mKeyguardMonitor.isDeviceInteractive()) { return; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java index 970fed0421de4..c175180bc9978 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java @@ -112,6 +112,10 @@ public final class KeyguardMonitor extends KeyguardUpdateMonitorCallback { notifyKeyguardChanged(); } + public boolean isDeviceInteractive() { + return mKeyguardUpdateMonitor.isDeviceInteractive(); + } + private void updateCanSkipBouncerState() { mCanSkipBouncer = mKeyguardUpdateMonitor.getUserCanSkipBouncer(mCurrentUser); }