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>
This commit is contained in:
Treehugger Robot
2023-06-30 15:53:21 +00:00
committed by Automerger Merge Worker

View File

@@ -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) {