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

Commit a12932ad authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CEC: Drop TODOs marked as fixed/obsolete" am: 44ab24bb am: 0efa9c5f... 

Merge "CEC: Drop TODOs marked as fixed/obsolete" am: 44ab24bb am: 0efa9c5f am: 3c30d795 am: 6628a772

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

Change-Id: I5ac332b5bc04242b33e01e4f1444121c18b1b503
parents ab61fc1a 6628a772

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

+0 −3
Original line number Diff line number Diff line
@@ -610,7 +610,6 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
                    Arrays.stream(device.getEncodings()).mapToObj(

                            AudioFormat::toLogFriendlyEncoding

                    ).collect(Collectors.joining(", ")));

            // TODO(b/80297701) use the actual device type that system audio mode is connected to.

            if (device.getType() == AudioDeviceInfo.TYPE_HDMI_ARC) {

                return device;

            }
@@ -1027,7 +1026,6 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
        if (isSystemAudioActivated() && port < 0) {

            // If system audio mode is on and the new active source is not under the current device,

            // Will switch to ARC input.

            // TODO(b/115637145): handle system aduio without ARC

            routeToInputFromPortId(Constants.CEC_SWITCH_ARC);

        } else if (mIsSwitchDevice && port >= 0) {

            // If current device is a switch and the new active source is under it,
@@ -1128,7 +1126,6 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 


    // Handle the system audio(ARC) part of the logic on receiving routing change or information.

    private void handleRoutingChangeAndInformationForSystemAudio() {

        // TODO(b/115637145): handle system aduio without ARC

        routeToInputFromPortId(Constants.CEC_SWITCH_ARC);

    }

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

+0 −1
Original line number Diff line number Diff line
@@ -479,7 +479,6 @@ public class HdmiCecMessageBuilder { 
     * @return newly created {@link HdmiCecMessage}

     */

    static HdmiCecMessage buildReportShortAudioDescriptor(int src, int des, byte[] sadBytes) {

        // TODO(b/80297701) validate.

        return buildCommand(src, des, Constants.MESSAGE_REPORT_SHORT_AUDIO_DESCRIPTOR, sadBytes);

    }