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

Merge "add TRANSPORT_THREAD to NetworkCapabilities"

Browse Source
This commit is contained in:
Kangping Dong
2023-02-28 07:16:16 +00:00
committed by Gerrit Code Review
parent 66b1b67b24 707a996c9b
commit 7dc4459d33
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/api/current.txt
View File

@@ -360,6 +360,7 @@ package android.net {
field public static final int TRANSPORT_CELLULAR = 0; // 0x0
field public static final int TRANSPORT_ETHERNET = 3; // 0x3
field public static final int TRANSPORT_LOWPAN = 6; // 0x6
field public static final int TRANSPORT_THREAD = 9; // 0x9
field public static final int TRANSPORT_USB = 8; // 0x8
field public static final int TRANSPORT_VPN = 4; // 0x4
field public static final int TRANSPORT_WIFI = 1; // 0x1

11
framework/src/android/net/NetworkCapabilities.java
View File

@@ -1110,6 +1110,7 @@ public final class NetworkCapabilities implements Parcelable {
TRANSPORT_LOWPAN,
TRANSPORT_TEST,
TRANSPORT_USB,
TRANSPORT_THREAD,
})
public @interface Transport { }
@@ -1161,10 +1162,15 @@ public final class NetworkCapabilities implements Parcelable {
*/
public static final int TRANSPORT_USB = 8;
/**
* Indicates this network uses a Thread transport.
*/
public static final int TRANSPORT_THREAD = 9;
/** @hide */
public static final int MIN_TRANSPORT = TRANSPORT_CELLULAR;
/** @hide */
public static final int MAX_TRANSPORT = TRANSPORT_USB;
public static final int MAX_TRANSPORT = TRANSPORT_THREAD;
private static final int ALL_VALID_TRANSPORTS;
static {
@@ -1189,7 +1195,8 @@ public final class NetworkCapabilities implements Parcelable {
"WIFI_AWARE",
"LOWPAN",
"TEST",
"USB"
"USB",
"THREAD",
};
/**

2
service/Android.bp
View File

@@ -171,7 +171,7 @@ java_library {
"androidx.annotation_annotation",
"connectivity-net-module-utils-bpf",
"connectivity_native_aidl_interface-lateststable-java",
"dnsresolver_aidl_interface-V9-java",
"dnsresolver_aidl_interface-V11-java",
"modules-utils-shell-command-handler",
"net-utils-device-common",
"net-utils-device-common-bpf",

2
tests/unit/java/android/net/util/KeepaliveUtilsTest.kt
View File

@@ -104,7 +104,7 @@ class KeepaliveUtilsTest {
// Check valid customization generates expected array.
val validRes = arrayOf("0,3", "1,0", "4,4")
val expectedValidRes = intArrayOf(3, 0, 0, 0, 4, 0, 0, 0, 0)
val expectedValidRes = intArrayOf(3, 0, 0, 0, 4, 0, 0, 0, 0, 0)
val mockContext = getMockedContextWithStringArrayRes(
R.array.config_networkSupportedKeepaliveCount,