Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" into sc-dev
This commit is contained in:
@@ -277,7 +277,7 @@ package android.net {
|
||||
method @NonNull public int[] getAdministratorUids();
|
||||
method @Nullable public static String getCapabilityCarrierName(int);
|
||||
method @Nullable public String getSsid();
|
||||
method @NonNull public java.util.Set<java.lang.Integer> getSubIds();
|
||||
method @NonNull public java.util.Set<java.lang.Integer> getSubscriptionIds();
|
||||
method @NonNull public int[] getTransportTypes();
|
||||
method public boolean isPrivateDnsBroken();
|
||||
method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities);
|
||||
@@ -308,7 +308,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 setSubscriptionIds(@NonNull java.util.Set<java.lang.Integer>);
|
||||
method @NonNull public android.net.NetworkCapabilities.Builder setTransportInfo(@Nullable android.net.TransportInfo);
|
||||
}
|
||||
|
||||
@@ -338,7 +338,7 @@ package android.net {
|
||||
|
||||
public static class NetworkRequest.Builder {
|
||||
method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP) public android.net.NetworkRequest.Builder setSignalStrength(int);
|
||||
method @NonNull public android.net.NetworkRequest.Builder setSubIds(@NonNull java.util.Set<java.lang.Integer>);
|
||||
method @NonNull public android.net.NetworkRequest.Builder setSubscriptionIds(@NonNull java.util.Set<java.lang.Integer>);
|
||||
}
|
||||
|
||||
public final class NetworkScore implements android.os.Parcelable {
|
||||
|
||||
Reference in New Issue
Block a user