Merge "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig" am: 51115a8705 am: 78df78fef9 am: 7604c6c0ac

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536153 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8a491c13545e1dbe09f46081303dc33eed71a467
2021-01-08 10:41:27 +00:00
parent 927845625a 7604c6c0ac
commit fe65e2d5c9
1 changed files with 0 additions and 1 deletions
--- 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) {