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

Commit d7aa5725 authored by junyulai's avatar junyulai
Browse files

[VCN12] Expose setSubIds/getSubIds APIs 

Test: atest NetworkCapabilitiesTest
Bug: 175662146
Change-Id: Ia4b98bc6c5fcefee44233f3b7fbb6517a0e8870e
parent 3b1bc322

packages/Connectivity/framework/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ package android.net { 
    method @Nullable public android.net.NetworkSpecifier getNetworkSpecifier();

    method public int getOwnerUid();

    method public int getSignalStrength();

    method @NonNull public java.util.Set<java.lang.Integer> getSubIds();

    method @Nullable public android.net.TransportInfo getTransportInfo();

    method public boolean hasCapability(int);

    method public boolean hasTransport(int);
@@ -399,6 +400,7 @@ package android.net { 
    method public android.net.NetworkRequest.Builder removeTransportType(int);

    method @Deprecated public android.net.NetworkRequest.Builder setNetworkSpecifier(String);

    method public android.net.NetworkRequest.Builder setNetworkSpecifier(android.net.NetworkSpecifier);

    method @NonNull public android.net.NetworkRequest.Builder setSubIds(@NonNull java.util.Set<java.lang.Integer>);

  }



  public class ProxyInfo implements android.os.Parcelable {

packages/Connectivity/framework/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ package android.net { 
    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setRequestorUid(int);

    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP) public android.net.NetworkCapabilities.Builder setSignalStrength(int);

    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setSsid(@Nullable String);

    method @NonNull public android.net.NetworkCapabilities.Builder setSubIds(@NonNull java.util.Set<java.lang.Integer>);

    method @NonNull public android.net.NetworkCapabilities.Builder setTransportInfo(@Nullable android.net.TransportInfo);

  }

packages/Connectivity/framework/src/android/net/NetworkCapabilities.java

+0 −3
Original line number Diff line number Diff line
@@ -2284,7 +2284,6 @@ public final class NetworkCapabilities implements Parcelable { 


    /**

     * Gets the subscription ID set that associated to this network or request.

     * @hide

     * @return

     */

    @NonNull
@@ -2637,8 +2636,6 @@ public final class NetworkCapabilities implements Parcelable { 
         *

         * @param subIds a set that represent the subscription IDs. Empty if clean up.

         * @return this builder.

         *

         * @hide

         */

        @NonNull

        public Builder setSubIds(@NonNull final Set<Integer> subIds) {

packages/Connectivity/framework/src/android/net/NetworkRequest.java

+0 −2
Original line number Diff line number Diff line
@@ -465,8 +465,6 @@ public class NetworkRequest implements Parcelable { 
         * An empty set matches all networks, including those without a subId.

         *

         * @param subIds A {@code Set} that represents subscription IDs.

         *

         * @hide

         */

        @NonNull

        public Builder setSubIds(@NonNull Set<Integer> subIds) {