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 changes I380d649c,I64734ee7,Ie6f3859e into main

Browse source 
* changes:
  Remove ensureIpServerStartedLegacy.
  Never create IpServers based on interface up for WIFI and WIFI_P2P.
  Rename the methods in the legacy codepath for clarity.
This commit is contained in:
Patrick Rohr 2025-05-16 02:15:46 -07:00 • committed by Android (Google) Code Review
commit ceb9f3e819
1 changed files with 37 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1008,23 +1008,11 @@ public class TetheringTest {
}
sendWifiApStateChanged(WIFI_AP_STATE_ENABLED);
// If, and only if, Tethering received an interface status changed then
// it creates a IpServer and sends out a broadcast indicating that the
// interface is "available".
if (emulateInterfaceStatusChanged) {
if (!SdkLevel.isAtLeastB()) {
// There is 1 IpServer state change event: STATE_AVAILABLE
verify(mNotificationUpdater, times(1)).onDownstreamChanged(DOWNSTREAM_NONE);
verifyTetheringBroadcast(TEST_WLAN_IFNAME, EXTRA_AVAILABLE_TETHER);
verify(mWifiManager).updateInterfaceIpState(
TEST_WLAN_IFNAME, WifiManager.IFACE_IP_MODE_UNSPECIFIED);
} else {
// Starting in B, ignore the interfaceStatusChanged
verify(mNotificationUpdater, never()).onDownstreamChanged(DOWNSTREAM_NONE);
verify(mWifiManager, never()).updateInterfaceIpState(
TEST_WLAN_IFNAME, WifiManager.IFACE_IP_MODE_UNSPECIFIED);
}
}
// Wi-Fi tethering ignores interface up events. The behaviour is the same
// regardless of whether the interface up event was received or not.
verify(mNotificationUpdater, never()).onDownstreamChanged(DOWNSTREAM_NONE);
verify(mWifiManager, never()).updateInterfaceIpState(
TEST_WLAN_IFNAME, WifiManager.IFACE_IP_MODE_UNSPECIFIED);
verifyNoMoreInteractions(mNetd);
verifyNoMoreInteractions(mWifiManager);
}
@ -2046,18 +2034,10 @@ public class TetheringTest {
sendWifiApStateChanged(WIFI_AP_STATE_ENABLED);
mLooper.dispatchAll();
if (!SdkLevel.isAtLeastB()) {
// There is 1 IpServer state change event: STATE_AVAILABLE from interfaceStatusChanged
verify(mNotificationUpdater, times(1)).onDownstreamChanged(DOWNSTREAM_NONE);
verifyTetheringBroadcast(TEST_WLAN_IFNAME, EXTRA_AVAILABLE_TETHER);
verify(mWifiManager).updateInterfaceIpState(
TEST_WLAN_IFNAME, WifiManager.IFACE_IP_MODE_UNSPECIFIED);
} else {
// Starting in B, ignore the interfaceStatusChanged
verify(mNotificationUpdater, never()).onDownstreamChanged(DOWNSTREAM_NONE);
verify(mWifiManager, never()).updateInterfaceIpState(
TEST_WLAN_IFNAME, WifiManager.IFACE_IP_MODE_UNSPECIFIED);
}
// Wi-Fi tethering ignores interface up events.
verify(mNotificationUpdater, never()).onDownstreamChanged(DOWNSTREAM_NONE);
verify(mWifiManager, never()).updateInterfaceIpState(
TEST_WLAN_IFNAME, WifiManager.IFACE_IP_MODE_UNSPECIFIED);
verifyNoMoreInteractions(mNetd);
verifyNoMoreInteractions(mWifiManager);
}
@ -3428,6 +3408,10 @@ public class TetheringTest {
mTethering.legacyTether(TEST_WIFI_IFNAME, result);
mLooper.dispatchAll();
result.assertHasResult();
// No IpServer should have been started, so no STATE_AVAILABLE should have been sent, and no
// tethering broadcasts should have been sent.
assertEquals(0, mIntents.size());
}
@Test