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

[Thread] add NetworkCapability.NOT_METERED for Thread network

Browse source 
Thread is an unmetered network so we should add this capability.

Bug: 332219983
Test: `bw_costly_thread-wpan` won't show up after this CL.
Change-Id: I0818700e5e7aad04ae15b0d0fd4490ab3f12839e
This commit is contained in:
Handa Wang 2024-04-01 07:28:04 +00:00
commit a92080f443
2 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java
View file

@ -699,6 +699,7 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub
new NetworkCapabilities.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_THREAD)
.addCapability(NetworkCapabilities.NET_CAPABILITY_LOCAL_NETWORK)
.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED)
.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED)
.build();
final NetworkScore score =

20
thread/tests/cts/src/android/net/thread/cts/ThreadNetworkControllerTest.java
View file

@ -17,6 +17,12 @@
package android.net.thread.cts;
import static android.Manifest.permission.ACCESS_NETWORK_STATE;
import static android.net.NetworkCapabilities.NET_CAPABILITY_LOCAL_NETWORK;
import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;
import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED;
import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED;
import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN;
import static android.net.NetworkCapabilities.NET_CAPABILITY_TRUSTED;
import static android.net.thread.ThreadNetworkController.DEVICE_ROLE_CHILD;
import static android.net.thread.ThreadNetworkController.DEVICE_ROLE_LEADER;
import static android.net.thread.ThreadNetworkController.DEVICE_ROLE_ROUTER;
@ -805,6 +811,20 @@ public class ThreadNetworkControllerTest {
assertThat(isAttached(mController)).isTrue();
assertThat(networkFuture.get(NETWORK_CALLBACK_TIMEOUT_MILLIS, MILLISECONDS)).isNotNull();
NetworkCapabilities caps =
runAsShell(
ACCESS_NETWORK_STATE, () -> cm.getNetworkCapabilities(networkFuture.get()));
assertThat(caps).isNotNull();
assertThat(caps.hasTransport(NetworkCapabilities.TRANSPORT_THREAD)).isTrue();
assertThat(caps.getCapabilities())
.asList()
.containsAtLeast(
NET_CAPABILITY_LOCAL_NETWORK,
NET_CAPABILITY_NOT_METERED,
NET_CAPABILITY_NOT_RESTRICTED,
NET_CAPABILITY_NOT_VCN_MANAGED,
NET_CAPABILITY_NOT_VPN,
NET_CAPABILITY_TRUSTED);
}
private void grantPermissions(String... permissions) {