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 "[Thread] add configuration methods in ThreadNetworkControllerWrapper" into main

Browse source
This commit is contained in:
Handa Wang 2024-10-17 05:37:33 +00:00 • committed by Gerrit Code Review
commit fe6dedde08
1 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

26
thread/tests/integration/src/android/net/thread/utils/ThreadNetworkControllerWrapper.java
View file

@ -29,6 +29,7 @@ import static java.util.concurrent.TimeUnit.SECONDS;
import android.annotation.Nullable;
import android.content.Context;
import android.net.thread.ActiveOperationalDataset;
import android.net.thread.ThreadConfiguration;
import android.net.thread.ThreadNetworkController;
import android.net.thread.ThreadNetworkController.StateCallback;
import android.net.thread.ThreadNetworkException;
@ -40,6 +41,7 @@ import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.function.Consumer;
/** A helper class which provides synchronous API wrappers for {@link ThreadNetworkController}. */
public final class ThreadNetworkControllerWrapper {
@ -47,6 +49,7 @@ public final class ThreadNetworkControllerWrapper {
public static final Duration LEAVE_TIMEOUT = Duration.ofSeconds(2);
private static final Duration CALLBACK_TIMEOUT = Duration.ofSeconds(1);
private static final Duration SET_ENABLED_TIMEOUT = Duration.ofSeconds(2);
private static final Duration CONFIG_TIMEOUT = Duration.ofSeconds(1);
private final ThreadNetworkController mController;
@ -191,6 +194,29 @@ public final class ThreadNetworkControllerWrapper {
future.get(CALLBACK_TIMEOUT.toSeconds(), SECONDS);
}
public ThreadConfiguration getConfiguration() throws Exception {
CompletableFuture<ThreadConfiguration> future = new CompletableFuture<>();
Consumer<ThreadConfiguration> callback = future::complete;
runAsShell(
PERMISSION_THREAD_NETWORK_PRIVILEGED,
() -> mController.registerConfigurationCallback(directExecutor(), callback));
future.get(CALLBACK_TIMEOUT.toSeconds(), SECONDS);
runAsShell(
PERMISSION_THREAD_NETWORK_PRIVILEGED,
() -> mController.unregisterConfigurationCallback(callback));
return future.getNow(null);
}
public void setConfigurationAndWait(ThreadConfiguration config) throws Exception {
CompletableFuture<Void> future = new CompletableFuture<>();
runAsShell(
PERMISSION_THREAD_NETWORK_PRIVILEGED,
() ->
mController.setConfiguration(
config, directExecutor(), newOutcomeReceiver(future)));
future.get(CALLBACK_TIMEOUT.toSeconds(), SECONDS);
}
private static <V> OutcomeReceiver<V, ThreadNetworkException> newOutcomeReceiver(
CompletableFuture<V> future) {
return new OutcomeReceiver<V, ThreadNetworkException>() {