Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c84a am: 18896c83ed

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie79141820782688b8705cf0edc59cf7a60c74f13
This commit is contained in:
Chiachang Wang
2021-01-27 05:45:07 +00:00
committed by Automerger Merge Worker
parent 54e430d69a 18896c83ed
commit 14dfb0cfe7
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/module-lib-current.txt
View File

@@ -14,6 +14,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); 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 { 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
} }

4
core/java/android/net/IpSecManager.java
View File

@@ -15,6 +15,8 @@
*/ */
package android.net; package android.net;
import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
import static com.android.internal.util.Preconditions.checkNotNull; import static com.android.internal.util.Preconditions.checkNotNull;
import android.annotation.NonNull; import android.annotation.NonNull;
@@ -628,7 +630,7 @@ public final class IpSecManager {
} }
/** @hide */ /** @hide */
@VisibleForTesting @SystemApi(client = MODULE_LIBRARIES)
public int getResourceId() { public int getResourceId() {
return mResourceId; return mResourceId;
} }