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

Commit 2f8f97c6 authored by Les Lee's avatar Les Lee Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59ab8adad819038715f7534ac746edbf923a92b9
parents 98aee6b9 6ae2535e

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6228,6 +6228,7 @@ 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



+0
−1




























Original line number
Diff line number
Diff line








@@ -272,7 +272,6 @@ 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) {