LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wear proxy behind portal

Browse Source 
Do not avoid captive portal on wear proxy network; keep network agent
after detecting portal.

Bug: 291112432
Test: atest FrameworksNetTests:android.net.connectivity.com.android.server.ConnectivityServiceTest
Change-Id: I8f6669da62ebd76b6a46d2aec9b3ea563a08cb5e
This commit is contained in:
Andriy Naborskyy
2023-09-26 02:03:18 +00:00
parent d196fab898
commit d032dd42ea
4 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -128,6 +128,7 @@ import static android.net.NetworkCapabilities.REDACT_FOR_ACCESS_FINE_LOCATION;
import static android.net.NetworkCapabilities.REDACT_FOR_LOCAL_MAC_ADDRESS;
import static android.net.NetworkCapabilities.REDACT_FOR_NETWORK_SETTINGS;
import static android.net.NetworkCapabilities.REDACT_NONE;
import static android.net.NetworkCapabilities.TRANSPORT_BLUETOOTH;
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
import static android.net.NetworkCapabilities.TRANSPORT_ETHERNET;
import static android.net.NetworkCapabilities.TRANSPORT_TEST;
@@ -4870,6 +4871,34 @@ public class ConnectivityServiceTest {
assertNoCallbacks(captivePortalCallback, validatedCallback);
}
@Test
public void testNoAvoidCaptivePortalOnWearProxy() throws Exception {
// Bring up a BLUETOOTH network which is companion proxy on wear
// then set captive portal.
mockHasSystemFeature(PackageManager.FEATURE_WATCH, true);
setCaptivePortalMode(ConnectivitySettingsManager.CAPTIVE_PORTAL_MODE_AVOID);
TestNetworkAgentWrapper btAgent = new TestNetworkAgentWrapper(TRANSPORT_BLUETOOTH);
final String firstRedirectUrl = "http://example.com/firstPath";
btAgent.connectWithCaptivePortal(firstRedirectUrl, false /* privateDnsProbeSent */);
btAgent.assertNotDisconnected(TIMEOUT_MS);
}
@Test
public void testAvoidCaptivePortalOnBluetooth() throws Exception {
// When not on Wear, BLUETOOTH is just regular network,
// then set captive portal.
mockHasSystemFeature(PackageManager.FEATURE_WATCH, false);
setCaptivePortalMode(ConnectivitySettingsManager.CAPTIVE_PORTAL_MODE_AVOID);
TestNetworkAgentWrapper btAgent = new TestNetworkAgentWrapper(TRANSPORT_BLUETOOTH);
final String firstRedirectUrl = "http://example.com/firstPath";
btAgent.connectWithCaptivePortal(firstRedirectUrl, false /* privateDnsProbeSent */);
btAgent.expectDisconnected();
btAgent.expectPreventReconnectReceived();
}
@Test
public void testCaptivePortalApi() throws Exception {
mServiceContext.setPermission(NETWORK_SETTINGS, PERMISSION_GRANTED);