commit 563414b082a494d04037ff08edae71932c86aa52
author Junyu Lai <junyulai@google.com> Fri Jan 29 17:15:28 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 29 17:15:28 2021 +0000
tree e651ed4989b3cc3fc46811680087497bcdde3ed1
parent 2606d64cfcff47d38f3ea1bfc2625ebfb5bab0d9
parent a04305b528abb91dcb5f735cf88b32a56eb59dbb

Merge "[FUI16] Expose setSubscriberId in NetworkAgentConfig as system API"

core/java/android/net/NetworkAgentConfig.java

diff --git a/core/java/android/net/NetworkAgentConfig.java b/core/java/android/net/NetworkAgentConfig.java
index fe1268d..664c265 100644
--- a/core/java/android/net/NetworkAgentConfig.java
+++ b/core/java/android/net/NetworkAgentConfig.java
@@ -16,6 +16,8 @@
 
 package android.net;
 
+import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
+
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.SystemApi;
@@ -125,6 +127,7 @@
      * @return the subscriber ID, or null if none.
      * @hide
      */
+    @SystemApi(client = MODULE_LIBRARIES)
     @Nullable
     public String getSubscriberId() {
         return subscriberId;
@@ -275,6 +278,7 @@
          * @hide
          */
         @NonNull
+        @SystemApi(client = MODULE_LIBRARIES)
         public Builder setSubscriberId(@Nullable String subscriberId) {
             mConfig.subscriberId = subscriberId;
             return this;