summaryrefslogtreecommitdiff
path: root/framework/src/android/net/NetworkRequest.java
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-04-22 05:22:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-22 05:22:10 +0000
commitf62a74d65ddfb23c733e2f90ca843428d3aedeb7 (patch)
tree5fde314937374e2bf713089be5b1eb85251878aa /framework/src/android/net/NetworkRequest.java
parent662285d4284b67d2a161a67d0252056b93270cfd (diff)
parenteb452d73303425ae64c0972f9f527220790517f7 (diff)
Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" am: 19a855be79 am: eb452d7330
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675629 Change-Id: I0292c32f0c0140213aa12309032421a18105bf02
Diffstat (limited to 'framework/src/android/net/NetworkRequest.java')
-rw-r--r--framework/src/android/net/NetworkRequest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/src/android/net/NetworkRequest.java b/framework/src/android/net/NetworkRequest.java
index 07b6c7d5be..8c4f4193b5 100644
--- a/framework/src/android/net/NetworkRequest.java
+++ b/framework/src/android/net/NetworkRequest.java
@@ -512,8 +512,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;
}
}