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
Merged-In: I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7
Change-Id: I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7
  (cherry-picked from ag/14198665)
This commit is contained in:
junyulai
2021-04-14 23:33:31 +08:00
parent 6cab3df7dc
commit 2217becf8d
6 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1733,7 +1733,7 @@ public final class NetworkCapabilities implements Parcelable {
combineSSIDs(nc);
combineRequestor(nc);
combineAdministratorUids(nc);
combineSubIds(nc);
combineSubscriptionIds(nc);
}
/**
@@ -1755,7 +1755,7 @@ public final class NetworkCapabilities implements Parcelable {
&& (onlyImmutable || satisfiedByUids(nc))
&& (onlyImmutable || satisfiedBySSID(nc))
&& (onlyImmutable || satisfiedByRequestor(nc))
&& (onlyImmutable || satisfiedBySubIds(nc)));
&& (onlyImmutable || satisfiedBySubscriptionIds(nc)));
}
/**
@@ -1852,7 +1852,7 @@ public final class NetworkCapabilities implements Parcelable {
&& equalsPrivateDnsBroken(that)
&& equalsRequestor(that)
&& equalsAdministratorUids(that)
&& equalsSubIds(that);
&& equalsSubscriptionIds(that);
}
@Override
@@ -2329,7 +2329,7 @@ public final class NetworkCapabilities implements Parcelable {
* @hide
*/
@NonNull
public NetworkCapabilities setSubIds(@NonNull Set<Integer> subIds) {
public NetworkCapabilities setSubscriptionIds(@NonNull Set<Integer> subIds) {
mSubIds = new ArraySet(Objects.requireNonNull(subIds));
return this;
}
@@ -2345,14 +2345,14 @@ public final class NetworkCapabilities implements Parcelable {
*/
@NonNull
@SystemApi
public Set<Integer> getSubIds() {
public Set<Integer> getSubscriptionIds() {
return new ArraySet<>(mSubIds);
}
/**
* 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);
}
@@ -2361,7 +2361,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
* 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 (nc.mSubIds.isEmpty()) return false;
for (final Integer subId : nc.mSubIds) {
@@ -2378,7 +2378,7 @@ public final class NetworkCapabilities implements Parcelable {
* <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.
*/
private void combineSubIds(@NonNull NetworkCapabilities nc) {
private void combineSubscriptionIds(@NonNull NetworkCapabilities nc) {
if (!Objects.equals(mSubIds, nc.mSubIds)) {
throw new IllegalStateException("Can't combine two subscription ID sets");
}
@@ -2720,8 +2720,8 @@ public final class NetworkCapabilities implements Parcelable {
*/
@NonNull
@SystemApi
public Builder setSubIds(@NonNull final Set<Integer> subIds) {
mCaps.setSubIds(subIds);
public Builder setSubscriptionIds(@NonNull final Set<Integer> subIds) {
mCaps.setSubscriptionIds(subIds);
return this;
}

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

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