Merge "Make hardware buttons just wake up device"

2020-12-14 18:13:46 +00:00
parent c5de978212 c138fa64ec
commit 869b1dc1e5
1 changed files with 5 additions and 2 deletions
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -4017,9 +4017,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
            return true;
        }

-        // Watches handle BACK specially
+        // Watches handle BACK and hardware buttons specially
        if (mHasFeatureWatch && (keyCode == KeyEvent.KEYCODE_BACK
-                || keyCode == KeyEvent.KEYCODE_STEM_PRIMARY)) {
+                || keyCode == KeyEvent.KEYCODE_STEM_PRIMARY
+                || keyCode == KeyEvent.KEYCODE_STEM_1
+                || keyCode == KeyEvent.KEYCODE_STEM_2
+                || keyCode == KeyEvent.KEYCODE_STEM_3)) {
            return false;
        }