Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose VPN_UID" am: 58f7a60187

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625699

Change-Id: Ib4f8073b2bd3962433d428df85aaee508ebd6ade
This commit is contained in:
Jeff Sharkey
2021-03-17 21:08:35 +00:00
committed by Automerger Merge Worker
parent 3c8dbe30d6 58f7a60187
commit 8710bc1755
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/module-lib-current.txt
View File

@@ -109,6 +109,10 @@ package android.os {
method public default int getStability(); method public default int getStability();
} }
public class Process {
field public static final int VPN_UID = 1016; // 0x3f8
}
public class StatsServiceManager { public class StatsServiceManager {
method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsCompanionServiceRegisterer(); method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsCompanionServiceRegisterer();
method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsManagerServiceRegisterer(); method @NonNull public android.os.StatsServiceManager.ServiceRegisterer getStatsManagerServiceRegisterer();

4
core/java/android/os/Process.java
View File

@@ -16,8 +16,11 @@
package android.os; package android.os;
import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.annotation.TestApi; import android.annotation.TestApi;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.system.ErrnoException; import android.system.ErrnoException;
@@ -104,6 +107,7 @@ public class Process {
* @hide * @hide
*/ */
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
@SystemApi(client = MODULE_LIBRARIES)
public static final int VPN_UID = 1016; public static final int VPN_UID = 1016;
/** /**