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

Merge "wear proxy behind portal" into main

Browse Source
This commit is contained in:
Andriy Naborskyy
2023-09-27 17:39:30 +00:00
committed by Gerrit Code Review
parent 8d44250440 d032dd42ea
commit 6aec2583cd
4 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/src/android/net/ConnectivitySettingsManager.java
View File

@@ -176,7 +176,9 @@ public class ConnectivitySettingsManager {
/**
* When detecting a captive portal, immediately disconnect from the
* network and do not reconnect to that network in the future.
* network and do not reconnect to that network in the future; except
* on Wear platform companion proxy networks (transport BLUETOOTH)
* will stay behind captive portal.
*/
public static final int CAPTIVE_PORTAL_MODE_AVOID = 2;

10
service/src/com/android/server/ConnectivityService.java
View File

@@ -4405,7 +4405,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
updateCapabilitiesForNetwork(nai);
} else if (portalChanged) {
if (portal && ConnectivitySettingsManager.CAPTIVE_PORTAL_MODE_AVOID
== getCaptivePortalMode()) {
== getCaptivePortalMode(nai)) {
if (DBG) log("Avoiding captive portal network: " + nai.toShortString());
nai.onPreventAutomaticReconnect();
teardownUnneededNetwork(nai);
@@ -4441,7 +4441,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
}
private int getCaptivePortalMode() {
private int getCaptivePortalMode(@NonNull NetworkAgentInfo nai) {
if (nai.networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH) &&
mContext.getPackageManager().hasSystemFeature(FEATURE_WATCH)) {
// Do not avoid captive portal when network is wear proxy.
return ConnectivitySettingsManager.CAPTIVE_PORTAL_MODE_PROMPT;
}
return Settings.Global.getInt(mContext.getContentResolver(),
ConnectivitySettingsManager.CAPTIVE_PORTAL_MODE,
ConnectivitySettingsManager.CAPTIVE_PORTAL_MODE_PROMPT);

5
tests/integration/util/com/android/server/NetworkAgentWrapper.java
View File

@@ -19,6 +19,7 @@ package com.android.server;
import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED;
import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED;
import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN;
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;
@@ -123,6 +124,10 @@ public class NetworkAgentWrapper implements TestableNetworkCallback.HasNetwork {
mNetworkCapabilities.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED);
mNetworkCapabilities.addTransportType(transport);
switch (transport) {
case TRANSPORT_BLUETOOTH:
// Score for Wear companion proxy network; not BLUETOOTH tethering.
mScore = new NetworkScore.Builder().setLegacyInt(100).build();
break;
case TRANSPORT_ETHERNET:
mScore = new NetworkScore.Builder().setLegacyInt(70).build();
break;

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);