diff options
| author | 2021-01-08 01:26:56 +0000 | |
|---|---|---|
| committer | 2021-01-08 01:26:56 +0000 | |
| commit | 2f8f97c64cdbe797c06eda48cf561fe0e62b39e3 (patch) | |
| tree | 6daea2104bf52c8c9128be427cc30d66c247e668 | |
| parent | 98aee6b9042156d4135f17f2629e2b506d6db08b (diff) | |
| parent | 6ae2535ec686bc089cf1b6c081a93cc84304cf7a (diff) | |
Merge "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig" am: 6ae2535ec6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536153
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I59ab8adad819038715f7534ac746edbf923a92b9
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/net/NetworkAgentConfig.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 85186dde2154..2a5f787f13ce 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -6228,6 +6228,7 @@ package android.net { method @NonNull public android.net.NetworkAgentConfig.Builder setLegacyType(int); method @NonNull public android.net.NetworkAgentConfig.Builder setLegacyTypeName(@NonNull String); method @NonNull public android.net.NetworkAgentConfig.Builder setPartialConnectivityAcceptable(boolean); + method @NonNull public android.net.NetworkAgentConfig.Builder setSubscriberId(@Nullable String); method @NonNull public android.net.NetworkAgentConfig.Builder setUnvalidatedConnectivityAcceptable(boolean); } diff --git a/core/java/android/net/NetworkAgentConfig.java b/core/java/android/net/NetworkAgentConfig.java index fe1268d79b89..c29d23d76de2 100644 --- a/core/java/android/net/NetworkAgentConfig.java +++ b/core/java/android/net/NetworkAgentConfig.java @@ -272,7 +272,6 @@ public final class NetworkAgentConfig implements Parcelable { * Sets the subscriber ID for this network. * * @return this builder, to facilitate chaining. - * @hide */ @NonNull public Builder setSubscriberId(@Nullable String subscriberId) { |