commit c414f4665fdde510f39107f05d27e5bc3fca6e75
author Jinsuk Kim <jinsukkim@google.com> Mon Dec 08 21:54:34 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 08 21:54:35 2014 +0000
tree 847deb0fcd473873bcdbf04709ef341a099b89b8
parent 882a1e89742607a3f1fdaa8f5bbd0eb894fc0150
parent 4fcbf0b93e15e60eeb8b08a32d895de07c73cb1b

Merge "CEC: Explictly remove and add device when updating" into lmp-mr1-dev

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

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index d39f2ed..62de534 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -1332,7 +1332,8 @@
         if (old == null) {
             invokeDeviceEventListener(info, HdmiControlManager.DEVICE_EVENT_ADD_DEVICE);
         } else if (!old.equals(info)) {
-            invokeDeviceEventListener(info, HdmiControlManager.DEVICE_EVENT_UPDATE_DEVICE);
+            invokeDeviceEventListener(old, HdmiControlManager.DEVICE_EVENT_REMOVE_DEVICE);
+            invokeDeviceEventListener(info, HdmiControlManager.DEVICE_EVENT_ADD_DEVICE);
         }
     }