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

Rename mActiveTetheringRequests to mPendingTetheringRequests

Browse source 
mActiveTetheringRequests is a misnomer because the requests aren't
actually active yet. Rename this to mPendingTetheringRequests since
they're pending a link layer event that the iface is ready to start IP
serving.

Bug: 216524590
Test: covered by existing tests
Change-Id: Ib0c4a52e0aa72fc27b67bce25187124b20082c05
This commit is contained in:
Quang Anh Luong 2025-01-29 12:55:34 +09:00 • committed by Lorenzo Colitti
commit caae4e7916
2 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -241,7 +241,7 @@ public class Tethering {
// Currently active tethering requests per tethering type. Only one of each type can be
// requested at a time. After a tethering type is requested, the map keeps tethering parameters
// to be used after the interface comes up asynchronously.
private final SparseArray<TetheringRequest> mActiveTetheringRequests =
private final SparseArray<TetheringRequest> mPendingTetheringRequests =
new SparseArray<>();
private final Context mContext;
@ -701,7 +701,7 @@ public class Tethering {
final IIntResultListener listener) {
mHandler.post(() -> {
final int type = request.getTetheringType();
final TetheringRequest unfinishedRequest = mActiveTetheringRequests.get(type);
final TetheringRequest unfinishedRequest = mPendingTetheringRequests.get(type);
// If tethering is already enabled with a different request,
// disable before re-enabling.
if (unfinishedRequest != null && !unfinishedRequest.equalsIgnoreUidPackage(request)) {
@ -709,7 +709,7 @@ public class Tethering {
unfinishedRequest.getInterfaceName(), null);
mEntitlementMgr.stopProvisioningIfNeeded(type);
}
mActiveTetheringRequests.put(type, request);
mPendingTetheringRequests.put(type, request);
if (request.isExemptFromEntitlementCheck()) {
mEntitlementMgr.setExemptedDownstreamType(type);
@ -728,7 +728,7 @@ public class Tethering {
});
}
void stopTetheringInternal(int type) {
mActiveTetheringRequests.remove(type);
mPendingTetheringRequests.remove(type);
enableTetheringInternal(type, false /* disabled */, null, null);
mEntitlementMgr.stopProvisioningIfNeeded(type);
@ -782,7 +782,7 @@ public class Tethering {
// If changing tethering fail, remove corresponding request
// no matter who trigger the start/stop.
if (result != TETHER_ERROR_NO_ERROR) {
mActiveTetheringRequests.remove(type);
mPendingTetheringRequests.remove(type);
mTetheringMetrics.updateErrorCode(type, result);
mTetheringMetrics.sendReport(type);
}
@ -944,7 +944,7 @@ public class Tethering {
public void onAvailable(String iface) {
if (this != mBluetoothCallback) return;
final TetheringRequest request = getActiveTetheringRequest(TETHERING_BLUETOOTH);
final TetheringRequest request = getPendingTetheringRequest(TETHERING_BLUETOOTH);
enableIpServing(request, TETHERING_BLUETOOTH, iface,
getRequestedState(TETHERING_BLUETOOTH));
mConfiguredBluetoothIface = iface;
@ -1002,7 +1002,7 @@ public class Tethering {
return;
}
final TetheringRequest request = getActiveTetheringRequest(TETHERING_ETHERNET);
final TetheringRequest request = getPendingTetheringRequest(TETHERING_ETHERNET);
enableIpServing(request, TETHERING_ETHERNET, iface,
getRequestedState(TETHERING_ETHERNET));
mConfiguredEthernetIface = iface;
@ -1025,7 +1025,7 @@ public class Tethering {
} else {
mConfiguredVirtualIface = iface;
}
final TetheringRequest request = getActiveTetheringRequest(TETHERING_VIRTUAL);
final TetheringRequest request = getPendingTetheringRequest(TETHERING_VIRTUAL);
enableIpServing(
request,
TETHERING_VIRTUAL,
@ -1071,7 +1071,7 @@ public class Tethering {
*/
@NonNull
private TetheringRequest getOrCreatePendingTetheringRequest(int type) {
TetheringRequest pending = mActiveTetheringRequests.get(type);
TetheringRequest pending = mPendingTetheringRequests.get(type);
if (pending != null) return pending;
Log.w(TAG, "No pending TetheringRequest for type " + type + " found, creating a placeholder"
@ -1180,7 +1180,7 @@ public class Tethering {
// TODO: see if the connectivity scope can be made (or is already) correct, and fetch the
// requested state from there.
final int type = tetherState.ipServer.interfaceType();
mActiveTetheringRequests.remove(type);
mPendingTetheringRequests.remove(type);
tetherState.ipServer.enable(requestedState, request);
return TETHER_ERROR_NO_ERROR;
}
@ -1242,7 +1242,7 @@ public class Tethering {
// TODO: make this take a TetheringRequest instead.
private int getRequestedState(int type) {
final TetheringRequest request = mActiveTetheringRequests.get(type);
final TetheringRequest request = mPendingTetheringRequests.get(type);
// The request could have been deleted before we had a chance to complete it.
// If so, assume that the scope is the default scope for this tethering type.
@ -1557,8 +1557,8 @@ public class Tethering {
}
@VisibleForTesting
SparseArray<TetheringRequest> getActiveTetheringRequests() {
return mActiveTetheringRequests;
SparseArray<TetheringRequest> getPendingTetheringRequests() {
return mPendingTetheringRequests;
}
@VisibleForTesting
@ -1618,8 +1618,8 @@ public class Tethering {
}
}
final TetheringRequest getActiveTetheringRequest(int type) {
return mActiveTetheringRequests.get(type, null);
final TetheringRequest getPendingTetheringRequest(int type) {
return mPendingTetheringRequests.get(type, null);
}
// TODO: make the request @NonNull and move the tetheringType and ipServingMode into it.
@ -1714,7 +1714,7 @@ public class Tethering {
case IFACE_IP_MODE_TETHERED:
ipServingMode = IpServer.STATE_TETHERED;
type = maybeInferWifiTetheringType(ifname);
request = getActiveTetheringRequest(type);
request = getPendingTetheringRequest(type);
break;
case IFACE_IP_MODE_LOCAL_ONLY:
ipServingMode = IpServer.STATE_LOCAL_ONLY;
@ -1724,7 +1724,7 @@ public class Tethering {
// historical behaviour. It mostly works because a) most of the time there is no
// such request b) tetherinternal doesn't look at the connectivity scope of the
// request, it takes the scope from requestedState.
request = getActiveTetheringRequest(type);
request = getPendingTetheringRequest(type);
break;
default:
mLog.e("Cannot enable IP serving in unknown WiFi mode: " + wifiIpMode);
@ -1769,7 +1769,7 @@ public class Tethering {
return;
}
final TetheringRequest request = getActiveTetheringRequest(tetheringType);
final TetheringRequest request = getPendingTetheringRequest(tetheringType);
if (ifaces != null) {
for (String iface : ifaces) {
if (ifaceNameToType(iface) == tetheringType) {

6
Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java
View file

@ -957,8 +957,8 @@ public class TetheringTest {
mTethering.startTethering(request, TEST_CALLER_PKG, null);
mLooper.dispatchAll();
assertEquals(1, mTethering.getActiveTetheringRequests().size());
assertEquals(request, mTethering.getActiveTetheringRequests().get(TETHERING_USB));
assertEquals(1, mTethering.getPendingTetheringRequests().size());
assertEquals(request, mTethering.getPendingTetheringRequests().get(TETHERING_USB));
if (mTethering.getTetheringConfiguration().isUsingNcm()) {
verify(mUsbManager).setCurrentFunctions(UsbManager.FUNCTION_NCM);
@ -2170,7 +2170,7 @@ public class TetheringTest {
runUsbTethering(upstreamState);
assertContains(Arrays.asList(mTethering.getTetheredIfaces()), TEST_RNDIS_IFNAME);
assertTrue(mTethering.isTetheringActive());
assertEquals(0, mTethering.getActiveTetheringRequests().size());
assertEquals(0, mTethering.getPendingTetheringRequests().size());
final Tethering.UserRestrictionActionListener ural = makeUserRestrictionActionListener(
mTethering, false /* currentDisallow */, true /* nextDisallow */);