tequilaOS/platform_packages_modules_Connectivity
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Thread] fix CTS for U branches

Browse source 
Per aosp/2936050, before Android V, an App needs to explictily set
NET_CAPABILITY_LOCAL_NETWORK to request a Thread network. This CL
updates the test case so it can pass on U devices.

Bug: 336678348
Test: atest CtsThreadNetworkTestCases

Change-Id: I383e34cb94f67286c5a5ab3bad7a11d98c3c2871
This commit is contained in:
Handa Wang 2024-04-24 05:04:27 +00:00
parent 926f012615
commit 42ea5408ae
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,6 +67,7 @@ import android.net.thread.ThreadNetworkManager;
import android.net.thread.utils.TapTestNetworkTracker;
import android.net.thread.utils.ThreadFeatureCheckerRule;
import android.net.thread.utils.ThreadFeatureCheckerRule.RequiresThreadFeature;
import android.os.Build;
import android.os.HandlerThread;
import android.os.OutcomeReceiver;
@ -782,10 +783,14 @@ public class ThreadNetworkControllerTest {
public void threadNetworkCallback_deviceAttached_threadNetworkIsAvailable() throws Exception {
CompletableFuture<Network> networkFuture = new CompletableFuture<>();
ConnectivityManager cm = mContext.getSystemService(ConnectivityManager.class);
NetworkRequest networkRequest =
new NetworkRequest.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_THREAD)
.build();
NetworkRequest.Builder networkRequestBuilder =
new NetworkRequest.Builder().addTransportType(NetworkCapabilities.TRANSPORT_THREAD);
// Before V, we need to explicitly set `NET_CAPABILITY_LOCAL_NETWORK` capability to request
// a Thread network.
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
networkRequestBuilder.addCapability(NET_CAPABILITY_LOCAL_NETWORK);
}
NetworkRequest networkRequest = networkRequestBuilder.build();
ConnectivityManager.NetworkCallback networkCallback =
new ConnectivityManager.NetworkCallback() {
@Override