From 2960af3978c15bd32a6916a0af826eb6183a526e Mon Sep 17 00:00:00 2001 From: Junyu Lai Date: Fri, 8 Jan 2021 06:05:56 +0000 Subject: [PATCH] Revert "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig" This reverts commit 7521c2277af5a0c23cd028d15aaa59de5c0cd8fc. Reason for revert: After discussion, we prefer to add a field in NetworkCapabilities instead. Sorry for inconvenience. Change-Id: I2e8840a797df9d1594f2b8b576bcd45beb184fca --- core/api/system-current.txt | 1 - core/java/android/net/NetworkAgentConfig.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 2a5f787f13ce6..85186dde2154c 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -6228,7 +6228,6 @@ 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 c29d23d76de24..fe1268d79b891 100644 --- a/core/java/android/net/NetworkAgentConfig.java +++ b/core/java/android/net/NetworkAgentConfig.java @@ -272,6 +272,7 @@ 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) {