From e73d20617efccd0eb8c1fd604147fadef62222d3 Mon Sep 17 00:00:00 2001
From: Aravind Angadi <aravind.angadi@ittiam.com>
Date: Fri, 25 Jun 2021 17:37:51 +0530
Subject: [PATCH] CEC: Update port info on hotplug events.

Update HdmiControlService#mPortInfo when hotplug events occur.

Bug: 159806029
Test: manual
Test: atest CtsHdmiCecHostTestCases
Change-Id: I590f7579dfb17d1b6ac0151829e5696966e93700
---
 .../java/com/android/server/hdmi/HdmiControlService.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index c56610cff2eb0..d3aa3fabd3e53 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -1239,13 +1239,11 @@ public class HdmiControlService extends SystemService {
     @ServiceThreadOnly
     void onHotplug(int portId, boolean connected) {
         assertRunOnServiceThread();
+        // initPortInfo at hotplug event.
+        mHdmiCecNetwork.initPortInfo();
 
         if (connected && !isTvDevice()
                 && getPortInfo(portId).getType() == HdmiPortInfo.PORT_OUTPUT) {
-            if (isSwitchDevice()) {
-                mHdmiCecNetwork.initPortInfo();
-                HdmiLogger.debug("initPortInfo for switch device when onHotplug from tx.");
-            }
             ArrayList<HdmiCecLocalDevice> localDevices = new ArrayList<>();
             for (int type : mLocalDevices) {
                 HdmiCecLocalDevice localDevice = mHdmiCecNetwork.getLocalDevice(type);