diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2021-03-17 22:26:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-17 22:26:17 +0000 |
| commit | 8c2ee9bc3e17b26ac2675ee21dd17f23b01b2fae (patch) | |
| tree | 2b64a27a391ce4e62820a850290be16a5d6b91f9 /core/java/android/os/Process.java | |
| parent | 9856e6331628e3aabd35e3289e4c4ca71595e5ae (diff) | |
| parent | a7913a06566b7f8821166884902145d6978170c6 (diff) | |
Merge "Expose VPN_UID" am: 58f7a60187 am: 8710bc1755 am: a7913a0656
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625699
Change-Id: I4899b2fe5733d24797d33a48069f15a9d4686bb5
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 e75e224d9a6f..ab1f688d60ca 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; /** |