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

Merge "Making Process.NFC_UID SystemApi for modules" am: 06580338e6 am: d086e8ee72 am: 0fcd2ed905

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

Change-Id: I7f153f5c39de361e5b65848792ad35d67dcd00e0
This commit is contained in:
Etienne Ruffieux
2022-01-21 00:18:44 +00:00
committed by Automerger Merge Worker
parent 6998eda597 0fcd2ed905
commit 26f9b5d78b
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -347,6 +347,7 @@ package android.os {
} }
public class Process { public class Process {
field public static final int NFC_UID = 1027; // 0x403
field public static final int VPN_UID = 1016; // 0x3f8 field public static final int VPN_UID = 1016; // 0x3f8
} }

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

@@ -129,6 +129,7 @@ public class Process {
*/ */
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
@TestApi @TestApi
@SystemApi(client = MODULE_LIBRARIES)
public static final int NFC_UID = 1027; public static final int NFC_UID = 1027;
/** /**