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

[VCN12] Expose setSubIds/getSubIds APIs

Browse Source 
Test: atest NetworkCapabilitiesTest
Bug: 175662146
Change-Id: Ia4b98bc6c5fcefee44233f3b7fbb6517a0e8870e
This commit is contained in:
junyulai
2021-03-11 20:20:19 +08:00
parent f3ca0ef14c
commit 26d680973f
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/api/current.txt
View File

@@ -293,6 +293,7 @@ package android.net {
method @Nullable public android.net.NetworkSpecifier getNetworkSpecifier();
method public int getOwnerUid();
method public int getSignalStrength();
method @NonNull public java.util.Set<java.lang.Integer> getSubIds();
method @Nullable public android.net.TransportInfo getTransportInfo();
method public boolean hasCapability(int);
method public boolean hasTransport(int);
@@ -399,6 +400,7 @@ package android.net {
method public android.net.NetworkRequest.Builder removeTransportType(int);
method @Deprecated public android.net.NetworkRequest.Builder setNetworkSpecifier(String);
method public android.net.NetworkRequest.Builder setNetworkSpecifier(android.net.NetworkSpecifier);
method @NonNull public android.net.NetworkRequest.Builder setSubIds(@NonNull java.util.Set<java.lang.Integer>);
}
public class ProxyInfo implements android.os.Parcelable {

1
framework/api/system-current.txt
View File

@@ -296,6 +296,7 @@ package android.net {
method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setRequestorUid(int);
method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP) public android.net.NetworkCapabilities.Builder setSignalStrength(int);
method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setSsid(@Nullable String);
method @NonNull public android.net.NetworkCapabilities.Builder setSubIds(@NonNull java.util.Set<java.lang.Integer>);
method @NonNull public android.net.NetworkCapabilities.Builder setTransportInfo(@Nullable android.net.TransportInfo);
}

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

@@ -2284,7 +2284,6 @@ public final class NetworkCapabilities implements Parcelable {
/**
* Gets the subscription ID set that associated to this network or request.
* @hide
* @return
*/
@NonNull
@@ -2637,8 +2636,6 @@ public final class NetworkCapabilities implements Parcelable {
*
* @param subIds a set that represent the subscription IDs. Empty if clean up.
* @return this builder.
*
* @hide
*/
@NonNull
public Builder setSubIds(@NonNull final Set<Integer> subIds) {

2
framework/src/android/net/NetworkRequest.java
View File

@@ -465,8 +465,6 @@ public class NetworkRequest implements Parcelable {
* An empty set matches all networks, including those without a subId.
*
* @param subIds A {@code Set} that represents subscription IDs.
*
* @hide
*/
@NonNull
public Builder setSubIds(@NonNull Set<Integer> subIds) {