commit 002f7121b72c55cf21123a094f52424bde074c3c
author Andrei Stingaceanu <stg@google.com> Wed Mar 30 12:22:05 2016 +0100
committer Andrei Stingaceanu <stg@google.com> Fri Apr 01 10:07:29 2016 +0000
tree da01b5a1326a63914fe2b3e8aae6b4cc5d72049a
parent faecc3f800cf2eaaf94f563faaba44193582e8b0

Keyboard shortcuts: disable toggling from lockscreen

Do not allow toggling the keyboard shortcuts dialog
if the keyguard is locked.

Bug: 27717058
Change-Id: I4a16a863ed1a4d3cefa7ca41c1361592ef3c5b3c

services/core/java/com/android/server/policy/PhoneWindowManager.java

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 747e31e..14d0457 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -3107,10 +3107,8 @@
                 return -1;
             }
         } else if (keyCode == KeyEvent.KEYCODE_SLASH && event.isMetaPressed()) {
-            if (down) {
-                if (repeatCount == 0) {
-                    toggleKeyboardShortcutsMenu(event.getDeviceId());
-                }
+            if (down && repeatCount == 0 && !isKeyguardLocked()) {
+                toggleKeyboardShortcutsMenu(event.getDeviceId());
             }
         } else if (keyCode == KeyEvent.KEYCODE_ASSIST) {
             if (down) {