summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-06-30 15:16:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-30 15:16:02 +0000
commit4ea9d05e815d001636c9d1411284a7b0f2ac7798 (patch)
tree4c8c57b681b0de118faa0da067d46d635450755a
parentf599b933a00fc3117172f0f4dcc9c3c5f48f2941 (diff)
parent15559f1d013ad80289e9da024addd84c077ffc9e (diff)
Merge "Fix <Routing Change> doesn't send on first switch." am: 15559f1d01
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2583818 Change-Id: I915334b6180c16d69fceeeec54737ae775895f7c 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 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) {