commit 37659eed7d7de1828dde03296e2958dc5d4d0cec
author TreeHugger Robot <treehugger-gerrit@google.com> Mon May 15 04:27:32 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 15 04:27:38 2017 +0000
tree 997e15072fc98f7a1f52a31ca7619b9134f4b603
parent 63a41f4e5ccf5ffa0ea088b0b2246f512e0d8b8f
parent ba18d8ed0ebdeae2b6903527900ade6b4d7364c0

Merge "Launch voice assistant by the KEYCODE_MEDIA_PLAY_PAUSE" into oc-dev

services/core/java/com/android/server/media/MediaSessionService.java

diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java
index 0db1b5d..2cb9cdd4 100644
--- a/services/core/java/com/android/server/media/MediaSessionService.java
+++ b/services/core/java/com/android/server/media/MediaSessionService.java
@@ -1505,7 +1505,8 @@
         }
 
         private boolean isVoiceKey(int keyCode) {
-            return keyCode == KeyEvent.KEYCODE_HEADSETHOOK;
+            return keyCode == KeyEvent.KEYCODE_HEADSETHOOK
+                    || keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE;
         }
 
         private boolean isUserSetupComplete() {