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

Commit 8c2ee9bc authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge "Expose VPN_UID" am: 58f7a601 am: 8710bc17 am: a7913a06 

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

Change-Id: I4899b2fe5733d24797d33a48069f15a9d4686bb5
parents 9856e633 a7913a06

core/api/module-lib-current.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -258,6 +258,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();

core/java/android/os/Process.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -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;
@@ -108,6 +111,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;





    /**

    /**