From dcf1a84842bf23012f9fcb09f9722e4bbe1b70af Mon Sep 17 00:00:00 2001 From: Amy Date: Thu, 13 Jun 2019 15:06:15 -0700 Subject: Use sendVolumeKeyEvent API instead of sendKeyEvent API sendKeyEvent API always forwards the key control to the TV. But for volume keys, we want it to be forwarded to the audio system if system audio mode is on and if we are not a audio system itself. sendVolumeKeyEvent can handle this logic. Test: manual Bug: 129116245 Change-Id: I6b81072ab49c092fac65cd542c19e611fc939cea Merged-In: I6b81072ab49c092fac65cd542c19e611fc939cea (cherry picked from commit ada40f59b63fe613448278a7cfbb7055146f8ccd) --- services/core/java/com/android/server/audio/AudioService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 5aa6a60bd44a..89e97d2419d8 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -1917,8 +1917,8 @@ public class AudioService extends IAudioService.Stub if (keyCode != KeyEvent.KEYCODE_UNKNOWN) { final long ident = Binder.clearCallingIdentity(); try { - mHdmiPlaybackClient.sendKeyEvent(keyCode, true); - mHdmiPlaybackClient.sendKeyEvent(keyCode, false); + mHdmiPlaybackClient.sendVolumeKeyEvent(keyCode, true); + mHdmiPlaybackClient.sendVolumeKeyEvent(keyCode, false); } finally { Binder.restoreCallingIdentity(ident); } -- cgit v1.2.3-59-g8ed1b