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

Commit fb49146c authored by Yuncheol Heo's avatar Yuncheol Heo Committed by Android Git Automerger
Browse files

am 2edc7f24: am ddf679ec: am 5c0d3862: Merge "Make the playback device pass CEC CTS." into lmp-dev 

* commit '2edc7f24468e3b609c78cbfa767b83240f5b17f5':
  Make the playback device pass CEC CTS.
parents 8f06311d 44ed5097

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

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice { 
    void onHotplug(int portId, boolean connected) {

        assertRunOnServiceThread();

        mCecMessageCache.flushAll();

        mIsActiveSource = false;

        // We'll not clear mIsActiveSource on the hotplug event to pass CETC 11.2.2-2 ~ 3.

        if (connected && mService.isPowerStandbyOrTransient()) {

            mService.wakeUp();

        }

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

+1 −0
Original line number Diff line number Diff line
@@ -428,6 +428,7 @@ public final class HdmiControlService extends SystemService { 
    private void allocateLogicalAddress(final ArrayList<HdmiCecLocalDevice> allocatingDevices,

            final int initiatedBy) {

        assertRunOnServiceThread();

        mCecController.clearLogicalAddress();

        final ArrayList<HdmiCecLocalDevice> allocatedDevices = new ArrayList<>();

        final int[] finished = new int[1];

        for (final HdmiCecLocalDevice localDevice : allocatingDevices) {