Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26f9b5d7 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Making Process.NFC_UID SystemApi for modules" am: 06580338 am: d086e8ee am: 0fcd2ed9 

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

Change-Id: I7f153f5c39de361e5b65848792ad35d67dcd00e0
parents 6998eda5 0fcd2ed9

core/api/module-lib-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -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

  }

  }

core/java/android/os/Process.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -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;





    /**

    /**