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

Commit a91af357 authored by Amy Zhang's avatar Amy Zhang Committed by Android (Google) Code Review
Browse files

Merge "Update the Active Source internallty when Active Path from <System... 

Merge "Update the Active Source internallty when Active Path from <System Audio Mode Request> does not match the internal active source physical address."
parents 3a93c007 7aa17979

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

+15 −1
Original line number Diff line number Diff line
@@ -791,7 +791,21 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
            int sourcePhysicalAddress = HdmiUtils.twoBytesToInt(message.getParams());

            if (sourcePhysicalAddress != getActiveSource().physicalAddress) {

                // If the Active Source recorded by the current device is not synced up with TV,

                // TODO(amyjojo): update Active Source internally

                // update the Active Source internally.

                for (HdmiDeviceInfo info : HdmiUtils.sparseArrayToList(mDeviceInfos)) {

                    if (info.getPhysicalAddress() == sourcePhysicalAddress) {

                        setActiveSource(info.getLogicalAddress(), info.getPhysicalAddress());

                        break;

                    }

                }

                // If the Active path from TV's System Audio Mode request does not belong to any

                // device in the local device list, record the new Active physicalAddress with an

                // unregistered logical address first. Then query the Active Source again.

                if (sourcePhysicalAddress != getActiveSource().physicalAddress) {

                    setActiveSource(Constants.ADDR_UNREGISTERED, sourcePhysicalAddress);

                    mService.sendCecCommand(

                        HdmiCecMessageBuilder.buildRequestActiveSource(mAddress));

                }

            }

            switchInputOnReceivingNewActivePath(sourcePhysicalAddress);

        }