Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig" am: 6ae2535ec6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536153

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59ab8adad819038715f7534ac746edbf923a92b9
This commit is contained in:
Les Lee
2021-01-08 01:26:56 +00:00
committed by Automerger Merge Worker
parent 98aee6b904 6ae2535ec6
commit 2f8f97c64c
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -6228,6 +6228,7 @@ package android.net {
method @NonNull public android.net.NetworkAgentConfig.Builder setLegacyType(int); 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 setLegacyTypeName(@NonNull String);
method @NonNull public android.net.NetworkAgentConfig.Builder setPartialConnectivityAcceptable(boolean); 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); method @NonNull public android.net.NetworkAgentConfig.Builder setUnvalidatedConnectivityAcceptable(boolean);
} }

1
core/java/android/net/NetworkAgentConfig.java
View File

@@ -272,7 +272,6 @@ public final class NetworkAgentConfig implements Parcelable {
* Sets the subscriber ID for this network. * Sets the subscriber ID for this network.
* *
* @return this builder, to facilitate chaining. * @return this builder, to facilitate chaining.
* @hide
*/ */
@NonNull @NonNull
public Builder setSubscriberId(@Nullable String subscriberId) { public Builder setSubscriberId(@Nullable String subscriberId) {