commit | 068f302f668cf569fdebe3ed50d27452bcf650e3 | [log] [tgz] |
---|---|---|
author | Kangping Dong <wgtdkp@google.com> | Thu Sep 12 06:08:15 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 12 06:08:15 2024 +0000 |
tree | 1bbf812b40cd31e2c22636182d748648ecb9edc1 | |
parent | 289338cf9e23a2aa49b1bc789a19905c2b48b8bd [diff] | |
parent | ba7cd0b9b96df9d60b6395da435596473e56251a [diff] |
[Thread] rename requestThreadNetwork to registerThreadNetworkCallback am: 0ffdc107e7 am: ba7cd0b9b9 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3265031 Change-Id: I2b12f98878fb1c74b7755c7e47bb2489ac6f2395 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java b/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java index 6edaae9..362ca7e 100644 --- a/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java +++ b/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java
@@ -447,7 +447,7 @@ } mConnectivityManager.registerNetworkProvider(mNetworkProvider); requestUpstreamNetwork(); - requestThreadNetwork(); + registerThreadNetworkCallback(); mUserRestricted = isThreadUserRestricted(); registerUserRestrictionsReceiver(); maybeInitializeOtDaemon(); @@ -768,7 +768,7 @@ } } - private void requestThreadNetwork() { + private void registerThreadNetworkCallback() { mConnectivityManager.registerNetworkCallback( new NetworkRequest.Builder() // clearCapabilities() is needed to remove forbidden capabilities and UID