LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[Thread] make the Manager and Controller class 'final'" into main am: 077e444720 am: d2844e61de

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

Change-Id: I509517bbdbe49577b7c6bcf53b1dea448ff2617b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kangping Dong
2023-10-26 08:16:53 +00:00
committed by Automerger Merge Worker
parent a3f3fc8c26 d2844e61de
commit ada7a23a39
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework-t/api/system-current.txt
View File

@@ -492,12 +492,12 @@ package android.net.thread {
field @NonNull public static final android.os.Parcelable.Creator<android.net.thread.PendingOperationalDataset> CREATOR; field @NonNull public static final android.os.Parcelable.Creator<android.net.thread.PendingOperationalDataset> CREATOR;
} }
@FlaggedApi("com.android.net.thread.flags.thread_enabled") public class ThreadNetworkController { @FlaggedApi("com.android.net.thread.flags.thread_enabled") public final class ThreadNetworkController {
method public int getThreadVersion(); method public int getThreadVersion();
field public static final int THREAD_VERSION_1_3 = 4; // 0x4 field public static final int THREAD_VERSION_1_3 = 4; // 0x4
} }
@FlaggedApi("com.android.net.thread.flags.thread_enabled") public class ThreadNetworkManager { @FlaggedApi("com.android.net.thread.flags.thread_enabled") public final class ThreadNetworkManager {
method @NonNull public java.util.List<android.net.thread.ThreadNetworkController> getAllThreadNetworkControllers(); method @NonNull public java.util.List<android.net.thread.ThreadNetworkController> getAllThreadNetworkControllers();
} }

2
thread/framework/java/android/net/thread/ThreadNetworkController.java
View File

@@ -34,7 +34,7 @@ import java.lang.annotation.RetentionPolicy;
*/ */
@FlaggedApi(ThreadNetworkFlags.FLAG_THREAD_ENABLED) @FlaggedApi(ThreadNetworkFlags.FLAG_THREAD_ENABLED)
@SystemApi @SystemApi
public class ThreadNetworkController { public final class ThreadNetworkController {
/** Thread standard version 1.3. */ /** Thread standard version 1.3. */
public static final int THREAD_VERSION_1_3 = 4; public static final int THREAD_VERSION_1_3 = 4;

2
thread/framework/java/android/net/thread/ThreadNetworkManager.java
View File

@@ -38,7 +38,7 @@ import java.util.List;
@FlaggedApi(ThreadNetworkFlags.FLAG_THREAD_ENABLED) @FlaggedApi(ThreadNetworkFlags.FLAG_THREAD_ENABLED)
@SystemApi @SystemApi
@SystemService(ThreadNetworkManager.SERVICE_NAME) @SystemService(ThreadNetworkManager.SERVICE_NAME)
public class ThreadNetworkManager { public final class ThreadNetworkManager {
/** /**
* This value tracks {@link Context#THREAD_NETWORK_SERVICE}. * This value tracks {@link Context#THREAD_NETWORK_SERVICE}.
* *