Request Thread network at the initialize() am: 90d2d0d0d9

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2900968

Change-Id: I637d60afc619a6f7d43ac4a4134bf01a59c42530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Handa Wang 2024-01-09 06:26:18 +00:00 • committed by Automerger Merge Worker
commit 79aca8554d

View file

@ -333,6 +333,7 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub
mLinkProperties.setMtu(TunInterfaceController.MTU);
mConnectivityManager.registerNetworkProvider(mNetworkProvider);
requestUpstreamNetwork();
requestThreadNetwork();
initializeOtDaemon();
});
@ -413,9 +414,10 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub
private void requestThreadNetwork() {
mConnectivityManager.registerNetworkCallback(
new NetworkRequest.Builder()
// clearCapabilities() is needed to remove forbidden capabilities and UID
// requirement.
.clearCapabilities()
.addTransportType(NetworkCapabilities.TRANSPORT_THREAD)
.removeForbiddenCapability(NetworkCapabilities.NET_CAPABILITY_LOCAL_NETWORK)
.build(),
new ThreadNetworkCallback(),
mHandler);
@ -459,8 +461,6 @@ final class ThreadNetworkControllerService extends IThreadNetworkController.Stub
return;
}
requestThreadNetwork();
mNetworkAgent = newNetworkAgent();
mNetworkAgent.register();
mNetworkAgent.markConnected();