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

add TRANSPORT_SATELLITE to NetworkCapabilities

Browse source 
This commit also updates to use V14 dnsresolver APIs which was V13.

Bug: 320514105
Test: m & atest FrameworksNetTests
Change-Id: I6e92f4d99e0eba3b5d1d5e45bf11e5e945ea43f1
This commit is contained in:
Nagendra Prasad Nagarle Basavaraju 2024-01-31 13:39:15 +00:00
commit 1fa6f09019
4 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
framework/api/current.txt
View file

@ -362,6 +362,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 @FlaggedApi("com.android.net.flags.support_transport_satellite") public static final int TRANSPORT_SATELLITE = 10; // 0xa
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

12
framework/src/android/net/NetworkCapabilities.java
View file

@ -132,6 +132,8 @@ public final class NetworkCapabilities implements Parcelable {
"com.android.net.flags.net_capability_local_network";
static final String REQUEST_RESTRICTED_WIFI =
"com.android.net.flags.request_restricted_wifi";
static final String SUPPORT_TRANSPORT_SATELLITE =
"com.android.net.flags.support_transport_satellite";
}
/**
@ -1255,6 +1257,7 @@ public final class NetworkCapabilities implements Parcelable {
TRANSPORT_TEST,
TRANSPORT_USB,
TRANSPORT_THREAD,
TRANSPORT_SATELLITE,
})
public @interface Transport { }
@ -1311,10 +1314,16 @@ public final class NetworkCapabilities implements Parcelable {
*/
public static final int TRANSPORT_THREAD = 9;
/**
* Indicates this network uses a Satellite transport.
*/
@FlaggedApi(Flags.SUPPORT_TRANSPORT_SATELLITE)
public static final int TRANSPORT_SATELLITE = 10;
/** @hide */
public static final int MIN_TRANSPORT = TRANSPORT_CELLULAR;
/** @hide */
public static final int MAX_TRANSPORT = TRANSPORT_THREAD;
public static final int MAX_TRANSPORT = TRANSPORT_SATELLITE;
private static final int ALL_VALID_TRANSPORTS;
static {
@ -1341,6 +1350,7 @@ public final class NetworkCapabilities implements Parcelable {
"TEST",
"USB",
"THREAD",
"SATELLITE",
};
/**

2
service/Android.bp
View file

@ -186,7 +186,7 @@ java_library {
"androidx.annotation_annotation",
"connectivity-net-module-utils-bpf",
"connectivity_native_aidl_interface-lateststable-java",
"dnsresolver_aidl_interface-V13-java",
"dnsresolver_aidl_interface-V14-java",
"modules-utils-shell-command-handler",
"net-utils-device-common",
"net-utils-device-common-ip",

4
tests/unit/java/android/net/util/KeepaliveUtilsTest.kt
View file

@ -95,11 +95,11 @@ class KeepaliveUtilsTest {
// Check resource with invalid transport type.
assertRunWithException(arrayOf("-1,3"))
assertRunWithException(arrayOf("10,3"))
assertRunWithException(arrayOf("11,3"))
// 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, 0)
val expectedValidRes = intArrayOf(3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0)
val mockContext = getMockedContextWithStringArrayRes(
R.array.config_networkSupportedKeepaliveCount,