summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-06-30 16:39:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-30 16:39:06 +0000
commit9b4edee1f426d3a189bc366a96935ba3aadce17e (patch)
treec6205b7339582d3c6a828a65daa917583338ce89
parent21410090334be8942c4b3e9ee136888de9f18455 (diff)
parent3d2b4b8e053457f9a6643267445dee001247dc62 (diff)
Merge "Fix <Routing Change> doesn't send on first switch." am: 15559f1d01 am: 4ea9d05e81 am: 3d2b4b8e05
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2583818 Change-Id: I27ea28c283108a3a0a56658b805d722735b34977 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index 5ef06f9f8967..effedce727f1 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 @@ public 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) {