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

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

Browse Source
This commit is contained in:
Jinsuk Kim
2014-12-22 22:48:44 +00:00
committed by Android (Google) Code Review
parent 4dcacef5c5 98d760e1c3
commit 92ae5abf4d
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) { private void invokeDeviceEventListener(HdmiDeviceInfo info, int status) {
if (info.isSourceType() && !hideDevicesBehindLegacySwitch(info)) { if (!hideDevicesBehindLegacySwitch(info)) {
mService.invokeDeviceEventListeners(info, status); 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 { private final class HdmiDeviceEventListener extends IHdmiDeviceEventListener.Stub {
@Override @Override
public void onStatusChanged(HdmiDeviceInfo deviceInfo, int status) { public void onStatusChanged(HdmiDeviceInfo deviceInfo, int status) {
if (!deviceInfo.isSourceType()) return;
synchronized (mLock) { synchronized (mLock) {
int messageType = 0; int messageType = 0;
Object obj = null; Object obj = null;