From c138fa64ecd9d44cdd42586b63cd7f5e4d55ca4c Mon Sep 17 00:00:00 2001
From: Ludvig Hansson <ludvig@google.com>
Date: Tue, 16 Jun 2020 12:26:11 +0000
Subject: [PATCH] Make hardware buttons just wake up device

Refrain from propagating hardware button events
to applications when in non-interactive state.

Bug: 159070675
Bug: 151278668
Change-Id: Ifa8c2702084430b1ce81ff41aab4bfef9bb54d9f
(cherry picked from commit 6c139702f6feb783ea93651a2a3ebd7712d71d9d)
(cherry picked from commit ffae2f6b750b3db835404fcdbe37b9e3d94b125a)
---
 .../java/com/android/server/policy/PhoneWindowManager.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index ea985df1c6b8f..5ecf2dfddfb74 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -4012,9 +4012,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;
         }