diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2021-03-17 21:08:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-17 21:08:35 +0000 |
| commit | 8710bc17550d9e2d8b55043814a5dfc2da1f7175 (patch) | |
| tree | 4cd796469c22ac9ef93e0c578bd5e7f04cf0288a /core/java/android/os/Process.java | |
| parent | 3c8dbe30d6d7239484b90274630cbb6f7b694ef6 (diff) | |
| parent | 58f7a60187d02ae2f072396a948812a8ab76f461 (diff) | |
Merge "Expose VPN_UID" am: 58f7a60187
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625699
Change-Id: Ib4f8073b2bd3962433d428df85aaee508ebd6ade
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 8c2ca6d3e509..9d16f18ab848 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; @@ -104,6 +107,7 @@ public class Process { * @hide */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @SystemApi(client = MODULE_LIBRARIES) public static final int VPN_UID = 1016; /** |