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

Commit fd672ded authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c8 am:... 

Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c8 am: 18896c83 am: 14dfb0cf am: 686fa2e9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa4ef79a6a51a21ff495ef4986f27991c3e6af70
parents e0b7f67f 686fa2e9

core/api/module-lib-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -160,6 +160,10 @@ package android.net { 
    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_TEST_NETWORKS, android.Manifest.permission.NETWORK_STACK}) public void simulateDataStall(int, long, @NonNull android.net.Network, @NonNull android.os.PersistableBundle);

  }



  public static final class IpSecManager.UdpEncapsulationSocket implements java.lang.AutoCloseable {

    method public int getResourceId();

  }



  public final class NetworkCapabilities implements android.os.Parcelable {

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

  }

core/java/android/net/IpSecManager.java

+3 −1
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */

package android.net;



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



import static com.android.internal.util.Preconditions.checkNotNull;



import android.annotation.NonNull;
@@ -628,7 +630,7 @@ public final class IpSecManager { 
        }



        /** @hide */

        @VisibleForTesting

        @SystemApi(client = MODULE_LIBRARIES)

        public int getResourceId() {

            return mResourceId;

        }