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

Commit 75df3bf9 authored by Jinsuk Kim's avatar Jinsuk Kim Committed by Android (Google) Code Review
Browse files

Merge "Invoke callback for HdmiControlService.deviceSelect() for internal source" into lmp-dev

parents 2d5720a0 5ad57168

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

+5 −2
Original line number Diff line number Diff line
@@ -135,7 +135,10 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
    void deviceSelect(int targetAddress, IHdmiControlCallback callback) {

        assertRunOnServiceThread();

        if (targetAddress == Constants.ADDR_INTERNAL) {

            handleSelectInternalSource(callback);

            handleSelectInternalSource();

            // Switching to internal source is always successful even when CEC control is disabled.

            setActiveSource(targetAddress);

            invokeCallback(callback, HdmiControlManager.RESULT_SUCCESS);

            return;

        }

        if (!mService.isControlEnabled()) {
@@ -153,7 +156,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
    }



    @ServiceThreadOnly

    private void handleSelectInternalSource(IHdmiControlCallback callback) {

    private void handleSelectInternalSource() {

        assertRunOnServiceThread();

        // Seq #18

        if (mService.isControlEnabled() && getActiveSource() != mAddress) {