Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d191773b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change sendVolumeKeyEvent condition" am: e20d8b2c am: d80bd762 am: badaba1b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2583221



Change-Id: Icbf4fe4b866d1cd314273288b1f32e7861760213
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd76c76c badaba1b

services/core/java/com/android/server/audio/AudioService.java

+9 −10
Original line number Diff line number Diff line
@@ -3596,16 +3596,15 @@ public class AudioService extends IAudioService.Stub 
            synchronized (mHdmiClientLock) {

                if (mHdmiManager != null) {

                    // At most one of mHdmiPlaybackClient and mHdmiTvClient should be non-null

                    HdmiClient fullVolumeHdmiClient = mHdmiPlaybackClient;

                    HdmiClient hdmiClient = mHdmiPlaybackClient;

                    if (mHdmiTvClient != null) {

                        fullVolumeHdmiClient = mHdmiTvClient;

                        hdmiClient = mHdmiTvClient;

                    }













                    if (fullVolumeHdmiClient != null













                    if (((mHdmiPlaybackClient != null && isFullVolumeDevice(device))













                            || (mHdmiTvClient != null && mHdmiSystemAudioSupported))















                            && mHdmiCecVolumeControlEnabled













                            && streamTypeAlias == AudioSystem.STREAM_MUSIC













                            // vol change on a full volume device













                            && isFullVolumeDevice(device)) {













                            && streamTypeAlias == AudioSystem.STREAM_MUSIC) {















                        int keyCode = KeyEvent.KEYCODE_UNKNOWN;















                        switch (direction) {















                            case AudioManager.ADJUST_RAISE:









@@ -3629,14 +3628,14 @@ public class AudioService extends IAudioService.Stub













                            try {















                                switch (keyEventMode) {















                                    case AudioDeviceVolumeManager.ADJUST_MODE_NORMAL:













                                        fullVolumeHdmiClient.sendVolumeKeyEvent(keyCode, true);













                                        fullVolumeHdmiClient.sendVolumeKeyEvent(keyCode, false);













                                        hdmiClient.sendVolumeKeyEvent(keyCode, true);













                                        hdmiClient.sendVolumeKeyEvent(keyCode, false);















                                        break;















                                    case AudioDeviceVolumeManager.ADJUST_MODE_START:













                                        fullVolumeHdmiClient.sendVolumeKeyEvent(keyCode, true);













                                        hdmiClient.sendVolumeKeyEvent(keyCode, true);















                                        break;















                                    case AudioDeviceVolumeManager.ADJUST_MODE_END:













                                        fullVolumeHdmiClient.sendVolumeKeyEvent(keyCode, false);













                                        hdmiClient.sendVolumeKeyEvent(keyCode, false);















                                        break;















                                    default:















                                        Log.e(TAG, "Invalid keyEventMode " + keyEventMode);