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] refactor OtDaemonServer::Initialize argument order

Browse source 
see aosp/3391987 for background

Change-Id: I798bfc172e3207c97d520785d62f5381c9d050ad
This commit is contained in:
Kangping Dong 2024-12-05 15:54:55 +08:00
commit 7ce2471354
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -351,14 +351,14 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub
}
otDaemon.initialize(
mTunIfController.getTunFd(),
shouldEnableThread(),
newOtDaemonConfig(mPersistentSettings.getConfiguration()),
mTunIfController.getTunFd(),
mNsdPublisher,
getMeshcopTxtAttributes(mResources.get()),
mOtDaemonCallbackProxy,
mCountryCodeSupplier.get(),
FeatureFlags.isTrelEnabled());
FeatureFlags.isTrelEnabled(),
mOtDaemonCallbackProxy);
otDaemon.asBinder().linkToDeath(() -> mHandler.post(this::onOtDaemonDied), 0);
mOtDaemon = otDaemon;
mHandler.post(mNat64CidrController::maybeUpdateNat64Cidr);

3
thread/tests/integration/src/android/net/thread/BorderRoutingTest.java
View file

@ -16,7 +16,6 @@
package android.net.thread;
import static android.Manifest.permission.MANAGE_TEST_NETWORKS;
import static android.net.InetAddresses.parseNumericAddress;
import static android.net.thread.utils.IntegrationTestUtils.DEFAULT_DATASET;
import static android.net.thread.utils.IntegrationTestUtils.buildIcmpv4EchoReply;
@ -38,7 +37,6 @@ import static android.system.OsConstants.ICMP_ECHO;
import static com.android.net.module.util.NetworkStackConstants.ICMPV6_ECHO_REPLY_TYPE;
import static com.android.net.module.util.NetworkStackConstants.ICMPV6_ECHO_REQUEST_TYPE;
import static com.android.testutils.TestPermissionUtil.runAsShell;
import static com.google.common.truth.Truth.assertThat;
@ -56,7 +54,6 @@ import android.net.LinkProperties;
import android.net.RouteInfo;
import android.net.thread.utils.FullThreadDevice;
import android.net.thread.utils.InfraNetworkDevice;
import android.net.thread.utils.IntegrationTestUtils;
import android.net.thread.utils.OtDaemonController;
import android.net.thread.utils.TestTunNetworkUtils;
import android.net.thread.utils.ThreadFeatureCheckerRule;