From bbfca33e2473757ee102208f0704f2521f20d52c Mon Sep 17 00:00:00 2001
From: "Kyeongkab.Nam" <Kyeongkab.Nam@sony.com>
Date: Fri, 14 Sep 2018 15:23:03 +0900
Subject: [PATCH] Change handling logic in SystemAudioAutoInitiationAction

Connection to sound system is lost when fail to send
<GiveSystemAudioModeStatus> and it changes to TV speaker.

This CL utilizes failsafe process(handleSystemAudioModeStatusTimeout)
already used in case that Audio system device did not reply to
<SystemAudioModeStatus>.
This will make TV keeps user last settings as possible.

Test: Sanity Test on Android TV connected to AVR.
      Switch TV to standby mode and turn it on after overnight.

Change-Id: I1b8f929cac6e322e9221a0c5b8e0b77737860adc
---
 .../android/server/hdmi/SystemAudioAutoInitiationAction.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/hdmi/SystemAudioAutoInitiationAction.java b/services/core/java/com/android/server/hdmi/SystemAudioAutoInitiationAction.java
index d347a9188dee1..f7e871d0b6452 100644
--- a/services/core/java/com/android/server/hdmi/SystemAudioAutoInitiationAction.java
+++ b/services/core/java/com/android/server/hdmi/SystemAudioAutoInitiationAction.java
@@ -50,8 +50,7 @@ final class SystemAudioAutoInitiationAction extends HdmiCecFeatureAction {
             @Override
             public void onSendCompleted(int error) {
                 if (error != SendMessageResult.SUCCESS) {
-                    tv().setSystemAudioMode(false);
-                    finish();
+                    handleSystemAudioModeStatusTimeout();
                 }
             }
         });