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

[VCN19] Rename get/setSubIds to get/setSubscriptionIds

Browse Source 
Test: atest FrameworksNetTests FrameworksVcnTests
Fix: 185215036
Ignore-AOSP-First: avoid merge conflict
Change-Id: I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7
This commit is contained in:
junyulai
2021-04-14 23:33:31 +08:00
parent f40b20ec1c
commit 9605391498
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -276,7 +276,7 @@ package android.net {
method @NonNull public int[] getAdministratorUids(); method @NonNull public int[] getAdministratorUids();
method @Nullable public static String getCapabilityCarrierName(int); method @Nullable public static String getCapabilityCarrierName(int);
method @Nullable public String getSsid(); 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 @NonNull public int[] getTransportTypes();
method public boolean isPrivateDnsBroken(); method public boolean isPrivateDnsBroken();
method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities); method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities);
@@ -307,7 +307,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_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_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 @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); method @NonNull public android.net.NetworkCapabilities.Builder setTransportInfo(@Nullable android.net.TransportInfo);
} }
@@ -337,7 +337,7 @@ package android.net {
public static class NetworkRequest.Builder { public static class NetworkRequest.Builder {
method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP) public android.net.NetworkRequest.Builder setSignalStrength(int); 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 { public final class NetworkScore implements android.os.Parcelable {

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

@@ -1749,7 +1749,7 @@ public final class NetworkCapabilities implements Parcelable {
combineSSIDs(nc); combineSSIDs(nc);
combineRequestor(nc); combineRequestor(nc);
combineAdministratorUids(nc); combineAdministratorUids(nc);
combineSubIds(nc); combineSubscriptionIds(nc);
} }
/** /**
@@ -1771,7 +1771,7 @@ public final class NetworkCapabilities implements Parcelable {
&& (onlyImmutable || satisfiedByUids(nc)) && (onlyImmutable || satisfiedByUids(nc))
&& (onlyImmutable || satisfiedBySSID(nc)) && (onlyImmutable || satisfiedBySSID(nc))
&& (onlyImmutable || satisfiedByRequestor(nc)) && (onlyImmutable || satisfiedByRequestor(nc))
&& (onlyImmutable || satisfiedBySubIds(nc))); && (onlyImmutable || satisfiedBySubscriptionIds(nc)));
} }
/** /**
@@ -1868,7 +1868,7 @@ public final class NetworkCapabilities implements Parcelable {
&& equalsPrivateDnsBroken(that) && equalsPrivateDnsBroken(that)
&& equalsRequestor(that) && equalsRequestor(that)
&& equalsAdministratorUids(that) && equalsAdministratorUids(that)
&& equalsSubIds(that); && equalsSubscriptionIds(that);
} }
@Override @Override
@@ -2346,7 +2346,7 @@ public final class NetworkCapabilities implements Parcelable {
* @hide * @hide
*/ */
@NonNull @NonNull
public NetworkCapabilities setSubIds(@NonNull Set<Integer> subIds) { public NetworkCapabilities setSubscriptionIds(@NonNull Set<Integer> subIds) {
mSubIds = new ArraySet(Objects.requireNonNull(subIds)); mSubIds = new ArraySet(Objects.requireNonNull(subIds));
return this; return this;
} }
@@ -2362,14 +2362,14 @@ public final class NetworkCapabilities implements Parcelable {
*/ */
@NonNull @NonNull
@SystemApi @SystemApi
public Set<Integer> getSubIds() { public Set<Integer> getSubscriptionIds() {
return new ArraySet<>(mSubIds); return new ArraySet<>(mSubIds);
} }
/** /**
* Tests if the subscription ID set of this network is the same as that of the passed one. * Tests if the subscription ID set of this network is the same as that of the passed one.
*/ */
private boolean equalsSubIds(@NonNull NetworkCapabilities nc) { private boolean equalsSubscriptionIds(@NonNull NetworkCapabilities nc) {
return Objects.equals(mSubIds, nc.mSubIds); return Objects.equals(mSubIds, nc.mSubIds);
} }
@@ -2378,7 +2378,7 @@ public final class NetworkCapabilities implements Parcelable {
* If specified in the request, the passed one need to have at least one subId and at least * If specified in the request, the passed one need to have at least one subId and at least
* one of them needs to be in the request set. * one of them needs to be in the request set.
*/ */
private boolean satisfiedBySubIds(@NonNull NetworkCapabilities nc) { private boolean satisfiedBySubscriptionIds(@NonNull NetworkCapabilities nc) {
if (mSubIds.isEmpty()) return true; if (mSubIds.isEmpty()) return true;
if (nc.mSubIds.isEmpty()) return false; if (nc.mSubIds.isEmpty()) return false;
for (final Integer subId : nc.mSubIds) { for (final Integer subId : nc.mSubIds) {
@@ -2395,7 +2395,7 @@ public final class NetworkCapabilities implements Parcelable {
* <p>If both subscription IDs are not equal, they belong to different subscription * <p>If both subscription IDs are not equal, they belong to different subscription
* (or no subscription). In this case, it would not make sense to add them together. * (or no subscription). In this case, it would not make sense to add them together.
*/ */
private void combineSubIds(@NonNull NetworkCapabilities nc) { private void combineSubscriptionIds(@NonNull NetworkCapabilities nc) {
if (!Objects.equals(mSubIds, nc.mSubIds)) { if (!Objects.equals(mSubIds, nc.mSubIds)) {
throw new IllegalStateException("Can't combine two subscription ID sets"); throw new IllegalStateException("Can't combine two subscription ID sets");
} }
@@ -2737,8 +2737,8 @@ public final class NetworkCapabilities implements Parcelable {
*/ */
@NonNull @NonNull
@SystemApi @SystemApi
public Builder setSubIds(@NonNull final Set<Integer> subIds) { public Builder setSubscriptionIds(@NonNull final Set<Integer> subIds) {
mCaps.setSubIds(subIds); mCaps.setSubscriptionIds(subIds);
return this; return this;
} }

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

@@ -508,8 +508,8 @@ public class NetworkRequest implements Parcelable {
*/ */
@NonNull @NonNull
@SystemApi @SystemApi
public Builder setSubIds(@NonNull Set<Integer> subIds) { public Builder setSubscriptionIds(@NonNull Set<Integer> subIds) {
mNetworkCapabilities.setSubIds(subIds); mNetworkCapabilities.setSubscriptionIds(subIds);
return this; return this;
} }
} }