From 53b8cb063d3e1bac4ee57b4a48fea96787851f12 Mon Sep 17 00:00:00 2001
From: Amy <amyjojo@google.com>
Date: Tue, 29 Jan 2019 17:22:03 -0800
Subject: [PATCH] Implement findAudioReceiverAddress for playback device.

Test: manual
Bug: 123369653
Change-Id: I75081717212967b60c45f5509101925c6d264fef
(cherry picked from commit ea5f30a1c82a287bd923ef2af8d0ebfe3339e608)
---
 .../android/server/hdmi/HdmiCecLocalDevicePlayback.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
index ef7d241590090..e7c4bf7443eed 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
@@ -279,6 +279,14 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource {
         return Constants.ADDR_TV;
     }
 
+    @Override
+    protected int findAudioReceiverAddress() {
+        if (mService.isSystemAudioActivated()) {
+            return Constants.ADDR_AUDIO_SYSTEM;
+        }
+        return Constants.ADDR_TV;
+    }
+
     @Override
     @ServiceThreadOnly
     protected void disableDevice(boolean initiatedByCec, PendingActionClearedCallback callback) {