From 94cdf3a2b5db2a177f068bcf833b6480f1959daf Mon Sep 17 00:00:00 2001 From: Amy Date: Thu, 13 Jun 2019 15:06:15 -0700 Subject: [PATCH] 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 (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 d3cafb7556fa0..8ef5b07531ced 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); }