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

Commit ac701e47 authored by Paul Colța's avatar Paul Colța Committed by Automerger Merge Worker
Browse files

Merge "cec: Reset system audio mode status carefully [2/2]" am: ec04d57b am:... 

Merge "cec: Reset system audio mode status carefully [2/2]" am: ec04d57b am: 82ef50b0 am: f386b1c3 am: 522bf9e3 am: 78d5f935

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



Change-Id: I7b9d0a094d4b115457b91310218c28d15108b743
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bbf5c709 78d5f935

services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java

+2 −1
Original line number Diff line number Diff line
@@ -110,7 +110,8 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
                    new SendMessageCallback() {

                        @Override

                        public void onSendCompleted(int error) {

                            if (error != SendMessageResult.SUCCESS) {

                            // In consideration of occasional transmission failures.

                            if (error == SendMessageResult.NACK) {

                                HdmiLogger.debug(

                                        "AVR did not respond to <Give System Audio Mode Status>");

                                mService.setSystemAudioActivated(false);