From 4fcbf0b93e15e60eeb8b08a32d895de07c73cb1b Mon Sep 17 00:00:00 2001
From: Jinsuk Kim <jinsukkim@google.com>
Date: Tue, 9 Dec 2014 06:48:13 +0900
Subject: [PATCH] CEC: Explictly remove and add device when updating

Sending UPDATE_DEVICE doesn't translate remove/add devices
when its address (physical) has changed. Send expclit removal
addition event.

Bug: 18513567
Change-Id: Ibea6accf0358994b64289c1a785de21b598453f1
---
 .../java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index d39f2ed14d8dd..62de5343fca6e 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 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
         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);
         }
     }