joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Wrap some IpServer commands"

Browse source
This commit is contained in:
Treehugger Robot 2022-12-02 21:48:05 +00:00 • committed by Gerrit Code Review
commit 767e5b6df6
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Tethering/src/android/net/ip/IpServer.java
View file

@ -378,6 +378,11 @@ public class IpServer extends StateMachine {
return Collections.unmodifiableList(mDhcpLeases);
}
/** Enable this IpServer. IpServer state machine will be tethered or localHotspot state. */
public void enable(final int requestedState, final TetheringRequestParcel request) {
sendMessage(CMD_TETHER_REQUESTED, requestedState, 0, request);
}
/** Stop this IpServer. After this is called this IpServer should not be used any more. */
public void stop() {
sendMessage(CMD_INTERFACE_DOWN);

7
Tethering/src/com/android/networkstack/tethering/Tethering.java
View file

@ -1001,8 +1001,7 @@ public class Tethering {
if (request != null) {
mActiveTetheringRequests.delete(type);
}
tetherState.ipServer.sendMessage(IpServer.CMD_TETHER_REQUESTED, requestedState, 0,
request);
tetherState.ipServer.enable(requestedState, request);
return TETHER_ERROR_NO_ERROR;
}
@ -1026,7 +1025,7 @@ public class Tethering {
Log.e(TAG, "Tried to untether an inactive iface :" + iface + ", ignoring");
return TETHER_ERROR_UNAVAIL_IFACE;
}
tetherState.ipServer.sendMessage(IpServer.CMD_TETHER_UNREQUESTED);
tetherState.ipServer.unwanted();
return TETHER_ERROR_NO_ERROR;
}
@ -1087,8 +1086,6 @@ public class Tethering {
final ArrayList<TetheringInterface> errored = new ArrayList<>();
final ArrayList<Integer> lastErrors = new ArrayList<>();
final TetheringConfiguration cfg = mConfig;
int downstreamTypesMask = DOWNSTREAM_NONE;
for (int i = 0; i < mTetherStates.size(); i++) {
final TetherState tetherState = mTetherStates.valueAt(i);