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

Commit 9da313fb authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

Merge "[FUI16] Expose setSubscriberId in NetworkAgentConfig as system API" am:... 

Merge "[FUI16] Expose setSubscriberId in NetworkAgentConfig as system API" am: 6194d765 am: 1800e224 am: 22745a5c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6e5747ccc97972a4c21058c600e72c5a3f3b61e
parents 4269d500 22745a5c

core/api/module-lib-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -165,6 +165,14 @@ package android.net { 
    method public int getResourceId();

  }



  public final class NetworkAgentConfig implements android.os.Parcelable {

    method @Nullable public String getSubscriberId();

  }



  public static final class NetworkAgentConfig.Builder {

    method @NonNull public android.net.NetworkAgentConfig.Builder setSubscriberId(@Nullable String);

  }



  public final class NetworkCapabilities implements android.os.Parcelable {

    field public static final int TRANSPORT_TEST = 7; // 0x7

  }

core/java/android/net/NetworkAgentConfig.java

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.net;



import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;
@@ -125,6 +127,7 @@ public final class NetworkAgentConfig implements Parcelable { 
     * @return the subscriber ID, or null if none.

     * @hide

     */

    @SystemApi(client = MODULE_LIBRARIES)

    @Nullable

    public String getSubscriberId() {

        return subscriberId;
@@ -275,6 +278,7 @@ public final class NetworkAgentConfig implements Parcelable { 
         * @hide

         */

        @NonNull

        @SystemApi(client = MODULE_LIBRARIES)

        public Builder setSubscriberId(@Nullable String subscriberId) {

            mConfig.subscriberId = subscriberId;

            return this;