summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorlucaslin <lucaslin@google.com>2021-03-17 19:04:01 +0800
committerlucaslin <lucaslin@google.com>2021-03-17 19:04:01 +0800
commite4ea3d4c842c2aea0b0b5a03005f6e9d43bc676f (patch)
treede53d8785e81c61f6f40c010d14c0296b3c16544 /core
parentdd68ace7e0f082394e10997cfb2e42fb0361e1f1 (diff)
Expose VPN_UID
ConnectivityService will be a part of mainline module, so it cannot access hidden API. Expose VPN_UID for ConnectivityService to access. Bug: 170598012 Test: m Change-Id: I9f74fb97ba27e5feacf1820cf75e28ad73516d7d
Diffstat (limited to 'core')
-rw-r--r--core/api/module-lib-current.txt4
-rw-r--r--core/java/android/os/Process.java4
2 files changed, 8 insertions, 0 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt
index 992b57f356c5..a21ce7998193 100644
--- a/core/api/module-lib-current.txt
+++ b/core/api/module-lib-current.txt
@@ -109,6 +109,10 @@ package android.os {
method public default int getStability();
}
+ public class Process {
+ field public static final int VPN_UID = 1016; // 0x3f8
+ }
+
public class StatsServiceManager {
method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsCompanionServiceRegisterer();
method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsManagerServiceRegisterer();
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;
/**