commit f44c7cc99830b0c3b35f8b9aba80ef486c655cf8
author Junyu Lai <junyulai@google.com> Fri Jan 08 13:45:08 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 08 13:45:08 2021 +0000
tree fdcb7fc73fde7126bea35dac7fdd932c61bbf427
parent 945be5904360969f316a8874ead471425401c808
parent 2960af3978c15bd32a6916a0af826eb6183a526e

Merge "Revert "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig""

core/api/system-current.txt

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 2a5f787..85186dd 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -6228,7 +6228,6 @@
     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);
   }
 

core/java/android/net/NetworkAgentConfig.java

diff --git a/core/java/android/net/NetworkAgentConfig.java b/core/java/android/net/NetworkAgentConfig.java
index c29d23d..fe1268d 100644
--- a/core/java/android/net/NetworkAgentConfig.java
+++ b/core/java/android/net/NetworkAgentConfig.java
@@ -272,6 +272,7 @@
          * Sets the subscriber ID for this network.
          *
          * @return this builder, to facilitate chaining.
+         * @hide
          */
         @NonNull
         public Builder setSubscriberId(@Nullable String subscriberId) {