Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b15416a authored Jan 08, 2021 by Junyu Lai Committed by Automerger Merge Worker Jan 08, 2021

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7b3dbf38a38a0ac0b1cfa86822a5eb3318b0990

parents e88250dd f44c7cc9

core/api/system-current.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6228,7 +6228,6 @@ 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);
	}		}

core/java/android/net/NetworkAgentConfig.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -272,6 +272,7 @@ 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) {