Merge "Expose VPN_UID"

This commit is contained in:
Jeff Sharkey
2021-03-17 20:38:41 +00:00
committed by Gerrit Code Review
2 changed files with 8 additions and 0 deletions

View File

@@ -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();

View File

@@ -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;
/**