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

am 33697d85: am 78a73577: Merge "CEC: Update CEC device info properly" into lmp-mr1-dev

Browse Source 
* commit '33697d859ff701e6aec101351b3b3a0395a6637c':
  CEC: Update CEC device info properly
This commit is contained in:
Jinsuk Kim
2014-12-08 19:43:16 +00:00
committed by Android Git Automerger
parent 6e5522ca81 33697d859f
commit ec3f3244ae
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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