From 1c21fc5e0ab9be575050c306e5c3e8a82db0cfd6 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Tue, 2 Aug 2016 16:12:58 -0700 Subject: [PATCH] Disable systemui navigation events while keyguard is showing This feature isn't generally useful on this screen and provides an additional mechanism for falsing, so it should be disabled. Fixes bug 30443528 Change-Id: Ibdba485917b5e66780ff4915f48ff2014f195eca --- .../com/android/systemui/statusbar/phone/PhoneStatusBar.java | 3 ++- 1 file changed, 2 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 c70312814eed0..4f34ec2029a51 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -2620,7 +2620,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, @Override public void handleSystemNavigationKey(int key) { if (SPEW) Log.d(TAG, "handleSystemNavigationKey: " + key); - if (!panelsEnabled() || !mKeyguardMonitor.isDeviceInteractive()) { + if (!panelsEnabled() || !mKeyguardMonitor.isDeviceInteractive() + || mKeyguardMonitor.isShowing()) { return; }