Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '92ae5abf4dac470c5c915ec4782d5af6f251d257':
  CEC: Let the caller check CEC device type
This commit is contained in:
Jinsuk Kim
2014-12-22 22:53:58 +00:00
committed by Android Git Automerger
parent 33868dab9a 92ae5abf4d
commit 266f2b047e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
View File

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

1
services/core/java/com/android/server/tv/TvInputHardwareManager.java
View File

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