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

Merge "Revert "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig"" am: f44c7cc998 am: 7b15416a2c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66fba706c6a8f78344026eac490ad266f838c21f
This commit is contained in:
Junyu Lai
2021-01-08 14:52:54 +00:00
committed by Automerger Merge Worker
parent 639e6eb5cf 7b15416a2c
commit 09460f1ccd
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,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);
}

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

@@ -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) {