diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2021-03-17 22:00:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-17 22:00:22 +0000 |
| commit | a7913a06566b7f8821166884902145d6978170c6 (patch) | |
| tree | 8e0cc898c6b9335efe47c153a13e3c9a9313fb18 /core/java/android/os/Process.java | |
| parent | 1dec957d6846c062dd39c5026f6561ef212a00ad (diff) | |
| parent | 8710bc17550d9e2d8b55043814a5dfc2da1f7175 (diff) | |
Merge "Expose VPN_UID" am: 58f7a60187 am: 8710bc1755
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625699
Change-Id: Idb15fe2671eac19159cc7f58319cdff7d4663bee
Diffstat (limited to 'core/java/android/os/Process.java')
| -rw-r--r-- | core/java/android/os/Process.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index bbc64c33f905..333e363dc56f 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -16,8 +16,11 @@ package android.os; +import static android.annotation.SystemApi.Client.MODULE_LIBRARIES; + import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.SystemApi; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.system.ErrnoException; @@ -108,6 +111,7 @@ public class Process { * @hide */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @SystemApi(client = MODULE_LIBRARIES) public static final int VPN_UID = 1016; /** |