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

Commit 09460f1c authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66fba706c6a8f78344026eac490ad266f838c21f
parents 639e6eb5 7b15416a

core/api/system-current.txt

+0 −1
Original line number 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 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);

  }

































core/java/android/net/NetworkAgentConfig.java



+1
−0




























Original line number
Diff line number
Diff line








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