From df9cced5126288c1feef5fbeed9a8b3603ba182e Mon Sep 17 00:00:00 2001 From: Quang Luong Date: Tue, 17 Dec 2024 01:24:27 -0800 Subject: [PATCH] Revert "Send TetheringRequest to restart Tethering from IpServer" This reverts commit 685b8aa50819d2736b2c04c6e09295625eaf771b. Reason for revert: May break Bluetooth pre-T IPv4 prefix conflict handling if TetheringRequest is not specified. Instead we should add this to AOSP/3389321 when we can guarantee IpServer always has a tethering request here. Bug: 384812983 Test: presubmit Change-Id: I9c65e87804855fd293fa75c921de3d256caad1b3 --- Tethering/src/android/net/ip/IpServer.java | 12 ++++++------ .../android/networkstack/tethering/Tethering.java | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Tethering/src/android/net/ip/IpServer.java b/Tethering/src/android/net/ip/IpServer.java index ebc9e4e844..e677dd5dda 100644 --- a/Tethering/src/android/net/ip/IpServer.java +++ b/Tethering/src/android/net/ip/IpServer.java @@ -168,10 +168,10 @@ public class IpServer extends StateMachineShim { /** * Request Tethering change. * - * @param request the TetheringRequest this IpServer was enabled with. + * @param tetheringType the downstream type of this IpServer. * @param enabled enable or disable tethering. */ - public void requestEnableTethering(TetheringRequest request, boolean enabled) { } + public void requestEnableTethering(int tetheringType, boolean enabled) { } } /** Capture IpServer dependencies, for injection. */ @@ -1178,8 +1178,8 @@ public class IpServer extends StateMachineShim { handleNewPrefixRequest((IpPrefix) message.obj); break; case CMD_NOTIFY_PREFIX_CONFLICT: - mLog.i("restart tethering: " + mIfaceName); - mCallback.requestEnableTethering(mTetheringRequest, false /* enabled */); + mLog.i("restart tethering: " + mInterfaceType); + mCallback.requestEnableTethering(mInterfaceType, false /* enabled */); transitionTo(mWaitingForRestartState); break; case CMD_SERVICE_FAILED_TO_START: @@ -1463,12 +1463,12 @@ public class IpServer extends StateMachineShim { case CMD_TETHER_UNREQUESTED: transitionTo(mInitialState); mLog.i("Untethered (unrequested) and restarting " + mIfaceName); - mCallback.requestEnableTethering(mTetheringRequest, true /* enabled */); + mCallback.requestEnableTethering(mInterfaceType, true /* enabled */); break; case CMD_INTERFACE_DOWN: transitionTo(mUnavailableState); mLog.i("Untethered (interface down) and restarting " + mIfaceName); - mCallback.requestEnableTethering(mTetheringRequest, true /* enabled */); + mCallback.requestEnableTethering(mInterfaceType, true /* enabled */); break; default: return false; diff --git a/Tethering/src/com/android/networkstack/tethering/Tethering.java b/Tethering/src/com/android/networkstack/tethering/Tethering.java index 254b60fda3..ad36e53a25 100644 --- a/Tethering/src/com/android/networkstack/tethering/Tethering.java +++ b/Tethering/src/com/android/networkstack/tethering/Tethering.java @@ -2207,9 +2207,9 @@ public class Tethering { break; } case EVENT_REQUEST_CHANGE_DOWNSTREAM: { - final boolean enabled = message.arg1 == 1; - final TetheringRequest request = (TetheringRequest) message.obj; - enableTetheringInternal(request.getTetheringType(), enabled, null, null); + final int tetheringType = message.arg1; + final Boolean enabled = (Boolean) message.obj; + enableTetheringInternal(tetheringType, enabled, null, null); break; } default: @@ -2787,9 +2787,9 @@ public class Tethering { } @Override - public void requestEnableTethering(TetheringRequest request, boolean enabled) { + public void requestEnableTethering(int tetheringType, boolean enabled) { mTetherMainSM.sendMessage(TetherMainSM.EVENT_REQUEST_CHANGE_DOWNSTREAM, - enabled ? 1 : 0, 0, request); + tetheringType, 0, enabled ? Boolean.TRUE : Boolean.FALSE); } }