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

Merge "CEC: Update CEC device info properly" into lmp-mr1-dev

Browse Source
This commit is contained in:
Jinsuk Kim
2014-12-08 15:43:33 +00:00
committed by Android (Google) Code Review
parent b9f245d464 6102bac706
commit 78a7357787
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1324,12 +1324,16 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
@ServiceThreadOnly @ServiceThreadOnly
final void addCecDevice(HdmiDeviceInfo info) { final void addCecDevice(HdmiDeviceInfo info) {
assertRunOnServiceThread(); assertRunOnServiceThread();
addDeviceInfo(info); HdmiDeviceInfo old = addDeviceInfo(info);
if (info.getLogicalAddress() == mAddress) { if (info.getLogicalAddress() == mAddress) {
// The addition of TV device itself should not be notified. // The addition of TV device itself should not be notified.
return; return;
} }
if (old == null) {
invokeDeviceEventListener(info, HdmiControlManager.DEVICE_EVENT_ADD_DEVICE); invokeDeviceEventListener(info, HdmiControlManager.DEVICE_EVENT_ADD_DEVICE);
} else if (!old.equals(info)) {
invokeDeviceEventListener(info, HdmiControlManager.DEVICE_EVENT_UPDATE_DEVICE);
}
} }
/** /**