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

Commit 85abc3d6 authored by Donghyun Cho's avatar Donghyun Cho Committed by android-build-merger
Browse files

Merge "CEC: Handle <Active Source> from AVR properly" into nyc-dev 

am: f09fcff8

* commit 'f09fcff8':
  CEC: Handle <Active Source> from AVR properly

Change-Id: If8d4e10effc2449b73d3eae458ec8ffb8d1e14e0
parents c232f42f f09fcff8

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

+5 −4
Original line number Diff line number Diff line
@@ -499,13 +499,14 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
                HdmiLogger.debug("Device info %X not found; buffering the command", logicalAddress);

                mDelayedMessageBuffer.add(message);

            }

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

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

            mDelayedMessageBuffer.add(message);

        } else {

        } else if (isInputReady(info.getId())

                || info.getDeviceType() == HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM) {

            updateDevicePowerStatus(logicalAddress, HdmiControlManager.POWER_STATUS_ON);

            ActiveSource activeSource = ActiveSource.of(logicalAddress, physicalAddress);

            ActiveSourceHandler.create(this, null).process(activeSource, info.getDeviceType());

        } else {

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

            mDelayedMessageBuffer.add(message);

        }

        return true;

    }