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

Commit 0ee85f3b authored by junyulai's avatar junyulai
Browse files

[FUI16] Expose setSubscriberId in NetworkAgentConfig as system API 

The wifi (mainline module) need to set the subscriberId for specific
wifi network.

Bug: 176396812
Test: TreeHugger
Change-Id: Ib568ce0c2d1b629e1c20e7ac8d8b78579cf4825c
parent 37356f41

core/api/module-lib-current.txt

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

    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 {

  public final class NetworkCapabilities implements android.os.Parcelable {

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

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

  }

  }

core/java/android/net/NetworkAgentConfig.java

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




package android.net;

package android.net;





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



import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.SystemApi;

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

     * @return the subscriber ID, or null if none.

     * @hide

     * @hide

     */

     */

    @SystemApi(client = MODULE_LIBRARIES)

    @Nullable

    @Nullable

    public String getSubscriberId() {

    public String getSubscriberId() {

        return subscriberId;

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

         * @hide

         */

         */

        @NonNull

        @NonNull

        @SystemApi(client = MODULE_LIBRARIES)

        public Builder setSubscriberId(@Nullable String subscriberId) {

        public Builder setSubscriberId(@Nullable String subscriberId) {

            mConfig.subscriberId = subscriberId;

            mConfig.subscriberId = subscriberId;

            return this;

            return this;