diff options
| author | 2023-06-30 15:53:21 +0000 | |
|---|---|---|
| committer | 2023-06-30 15:53:21 +0000 | |
| commit | 3d2b4b8e053457f9a6643267445dee001247dc62 (patch) | |
| tree | 7e02f6f0afdf34b299f3a4cc18e5a85812973a4d | |
| parent | b9a27df8a293b51987cf0eb6a40c24f1178e8032 (diff) | |
| parent | 4ea9d05e815d001636c9d1411284a7b0f2ac7798 (diff) | |
Merge "Fix <Routing Change> doesn't send on first switch." am: 15559f1d01 am: 4ea9d05e81
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2583818
Change-Id: Id4b6fbcd9dff4d5617a1ded7f0f159928c7592db
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.java | 1 |
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) { |