LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c84a am: 569e241d5c am: 9ee71fd652

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67420def56b12c3008daaa001b8f09680439d940
This commit is contained in:
Chiachang Wang
2021-01-27 08:05:05 +00:00
committed by Automerger Merge Worker
parent 93f61ef742 9ee71fd652
commit 64dc55bfb8
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;
} }