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

Commit 266f2b04 authored by Jinsuk Kim's avatar Jinsuk Kim Committed by Android Git Automerger
Browse files

am 92ae5abf: Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev 

* commit '92ae5abf':
  CEC: Let the caller check CEC device type
parents 33868dab 92ae5abf

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

+1 −1
Original line number Diff line number Diff line
@@ -1248,7 +1248,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
    }



    private void invokeDeviceEventListener(HdmiDeviceInfo info, int status) {

        if (info.isSourceType() && !hideDevicesBehindLegacySwitch(info)) {

        if (!hideDevicesBehindLegacySwitch(info)) {

            mService.invokeDeviceEventListeners(info, status);

        }

    }

services/core/java/com/android/server/tv/TvInputHardwareManager.java

+1 −0
Original line number Diff line number Diff line
@@ -1108,6 +1108,7 @@ class TvInputHardwareManager implements TvInputHal.Callback { 
    private final class HdmiDeviceEventListener extends IHdmiDeviceEventListener.Stub {

        @Override

        public void onStatusChanged(HdmiDeviceInfo deviceInfo, int status) {

            if (!deviceInfo.isSourceType()) return;

            synchronized (mLock) {

                int messageType = 0;

                Object obj = null;