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

Commit 7827ff33 authored by Amy's avatar Amy Committed by Amy Zhang
Browse files

cec: OneTouchPlay not buffer when input not ready 

BUG=131205504

Problem:
OneTouchPlay not buffer when input not ready and could
not go to corresponding input

Solution:
buffer <Active Source> when when input not ready,
process when input added

Cherry picked and modified from: https://partner-android-review.googlesource.com/c/platform/frameworks/base/+/1381152
Bug: 131205504
Test: manual
Change-Id: I442eddfe1aa9d587054428b78316ff86badc0d84
(cherry picked from commit 1f05fbab7c979200d9f83425e50f12db7d5d7212)
parent f66da1e5

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

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ final class DelayedMessageBuffer { 
        }

    }



    private void removeActiveSource() {

    protected void removeActiveSource() {

        // Uses iterator to remove elements while looping through the list.

        for (Iterator<HdmiCecMessage> iter = mBuffer.iterator(); iter.hasNext(); ) {

            HdmiCecMessage message = iter.next();

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

+44 −0
Original line number Diff line number Diff line
@@ -110,6 +110,12 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
    // device id is used as key of container.

    private final SparseArray<HdmiDeviceInfo> mDeviceInfos = new SparseArray<>();



    // Message buffer used to buffer selected messages to process later. <Active Source>

    // from a source device, for instance, needs to be buffered if the device is not

    // discovered yet. The buffered commands are taken out and when they are ready to

    // handle.

    private final DelayedMessageBuffer mDelayedMessageBuffer = new DelayedMessageBuffer(this);



    protected HdmiCecLocalDeviceAudioSystem(HdmiControlService service) {

        super(service, HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM);

        mRoutingControlFeatureEnabled =
@@ -151,6 +157,9 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
            }

            mPortIdToTvInputs.put(info.getPortId(), inputId);

            mTvInputsToDeviceInfo.put(inputId, info);

            if (info.isCecDevice()) {

                processDelayedActiveSource(info.getLogicalAddress());

            }

        }

    }
@@ -167,6 +176,15 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
        }

    }



    @Override

    @ServiceThreadOnly

    protected boolean isInputReady(int portId) {

        assertRunOnServiceThread();

        String tvInputId = mPortIdToTvInputs.get(portId);

        HdmiDeviceInfo info = mTvInputsToDeviceInfo.get(tvInputId);

        return info != null;

    }



    /**

     * Called when a device is newly added or a new device is detected or

     * an existing device is updated.
@@ -406,6 +424,32 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
                Constants.PROPERTY_PREFERRED_ADDRESS_AUDIO_SYSTEM, String.valueOf(addr));

    }



    @ServiceThreadOnly

    void processDelayedActiveSource(int address) {

        assertRunOnServiceThread();

        mDelayedMessageBuffer.processActiveSource(address);

    }



    @Override

    @ServiceThreadOnly

    protected boolean handleActiveSource(HdmiCecMessage message) {

        assertRunOnServiceThread();

        int logicalAddress = message.getSource();

        int physicalAddress = HdmiUtils.twoBytesToInt(message.getParams());

        HdmiDeviceInfo info = getCecDeviceInfo(logicalAddress);

        if (info == null) {

            HdmiLogger.debug("Device info %X not found; buffering the command", logicalAddress);

            mDelayedMessageBuffer.add(message);

        } else if (!isInputReady(info.getPortId())){

            HdmiLogger.debug("Input not ready for device: %X; buffering the command", info.getId());

            mDelayedMessageBuffer.add(message);

        } else {

            mDelayedMessageBuffer.removeActiveSource();

            super.handleActiveSource(message);

        }

        return true;

    }



    @Override

    @ServiceThreadOnly

    protected boolean handleReportPhysicalAddress(HdmiCecMessage message) {