From ff84d52fbc5cd51496cb2e221d3aa44e00011dc1 Mon Sep 17 00:00:00 2001
From: "Hannah.Hsu" <hannah.hsu@mediatek.com>
Date: Fri, 12 May 2023 17:39:53 +0800
Subject: Fix <Routing Change> doesn't send on first switch.

Bug: 262692976

Test: manually test by boot up TV

Change-Id: I18d58be62c0c28ec8aa5dd3f92c777950b54fd08
---
 services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index dd214b4ae21c..ae82dff2a794 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -377,6 +377,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
             return;
         }
         int oldPath = getActivePortId() != Constants.INVALID_PORT_ID
+                && getActivePortId() != Constants.CEC_SWITCH_HOME
                 ? mService.portIdToPath(getActivePortId()) : getDeviceInfo().getPhysicalAddress();
         setActivePath(oldPath);
         if (mSkipRoutingControl) {
-- 
cgit v1.2.3-59-g8ed1b