commit ec04d57b0bc472444eb8c9ea85bd75c1e755abbc
author Paul Colța <donpaul@google.com> Wed Jun 14 15:39:16 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 14 15:39:16 2023 +0000
tree 41925f703947067fd4a5b917dcb9bd88b37fec92
parent f6d437176c8aa35c7a0bc228cf1a04a2269f03b1
parent 82e0f752964aef3bc0504fb58aa8c1edf17d42f1

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

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

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
index 576a5ff..72895e3 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
@@ -110,7 +110,8 @@
                     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);