Merge "Implement findAudioReceiverAddress for playback device."

2019-02-04 18:47:15 +00:00
parent 38a701701d 53b8cb063d
commit 83a07847cb
1 changed files with 8 additions and 0 deletions
--- 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) {