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

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

@@ -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

@@ -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;