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] change the call to configureBorderRouter due to refactor

Browse source 
Bug: 357501813
Test: CI

Change-Id: Ia6b63f59e927175d05a6d3da6cebe11491664071
This commit is contained in:
Handa Wang 2024-08-05 07:58:21 +00:00
commit 7482055f9e
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -108,6 +108,7 @@ import android.os.Handler;
import android.os.HandlerThread;
import android.os.IBinder;
import android.os.Looper;
import android.os.ParcelFileDescriptor;
import android.os.RemoteException;
import android.os.SystemClock;
import android.os.UserManager;
@ -119,7 +120,7 @@ import com.android.internal.annotations.VisibleForTesting;
import com.android.server.ServiceManagerWrapper;
import com.android.server.connectivity.ConnectivityResources;
import com.android.server.thread.openthread.BackboneRouterState;
import com.android.server.thread.openthread.BorderRouterConfigurationParcel;
import com.android.server.thread.openthread.BorderRouterConfiguration;
import com.android.server.thread.openthread.DnsTxtAttribute;
import com.android.server.thread.openthread.IChannelMasksReceiver;
import com.android.server.thread.openthread.IOtDaemon;
@ -212,7 +213,7 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub
private boolean mUserRestricted;
private boolean mForceStopOtDaemonEnabled;
private BorderRouterConfigurationParcel mBorderRouterConfig;
private BorderRouterConfiguration mBorderRouterConfig;
@VisibleForTesting
ThreadNetworkControllerService(
@ -237,7 +238,7 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub
mInfraIfController = infraIfController;
mUpstreamNetworkRequest = newUpstreamNetworkRequest();
mNetworkToInterface = new HashMap<Network, String>();
mBorderRouterConfig = new BorderRouterConfigurationParcel();
mBorderRouterConfig = new BorderRouterConfiguration();
mPersistentSettings = persistentSettings;
mNsdPublisher = nsdPublisher;
mUserManager = userManager;
@ -1233,13 +1234,14 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub
Log.i(TAG, "Enable border routing on AIL: " + infraIfName);
try {
mBorderRouterConfig.infraInterfaceName = infraIfName;
mBorderRouterConfig.infraInterfaceIcmp6Socket =
mInfraIfController.createIcmp6Socket(infraIfName);
mBorderRouterConfig.isBorderRoutingEnabled = true;
ParcelFileDescriptor infraIcmp6Socket =
mInfraIfController.createIcmp6Socket(infraIfName);
getOtDaemon()
.configureBorderRouter(
mBorderRouterConfig, new ConfigureBorderRouterStatusReceiver());
mBorderRouterConfig,
infraIcmp6Socket,
new ConfigureBorderRouterStatusReceiver());
} catch (RemoteException | IOException | ThreadNetworkException e) {
Log.w(TAG, "Failed to enable border routing", e);
}
@ -1248,12 +1250,13 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub
private void disableBorderRouting() {
mUpstreamNetwork = null;
mBorderRouterConfig.infraInterfaceName = null;
mBorderRouterConfig.infraInterfaceIcmp6Socket = null;
mBorderRouterConfig.isBorderRoutingEnabled = false;
try {
getOtDaemon()
.configureBorderRouter(
mBorderRouterConfig, new ConfigureBorderRouterStatusReceiver());
mBorderRouterConfig,
null /* infraIcmp6Socket */,
new ConfigureBorderRouterStatusReceiver());
} catch (RemoteException | ThreadNetworkException e) {
Log.w(TAG, "Failed to disable border routing", e);
}