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

Commit aa888bc1 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Automerger Merge Worker
Browse files

Merge "Rename SupplementalProcess to SdkSandbox" into tm-dev am: 8056335f 

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

Change-Id: Ica3783c12434b242e5625e5f220495ba79d7c935
parents fd661fcc 8056335f

apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1377,7 +1377,7 @@ public class BlobStoreManagerService extends SystemService { 
    }



    private boolean isAllowedBlobAccess(int uid, String packageName) {

        return (!Process.isSupplemental(uid) && !Process.isIsolated(uid)

        return (!Process.isSdkSandboxUid(uid) && !Process.isIsolated(uid)

                && !mPackageManagerInternal.isInstantApp(packageName, UserHandle.getUserId(uid)));

    }

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -31858,7 +31858,7 @@ package android.os { 
    method public static final boolean is64Bit();

    method public static boolean isApplicationUid(int);

    method public static final boolean isIsolated();

    method public static final boolean isSupplemental();

    method public static final boolean isSdkSandbox();

    method public static final void killProcess(int);

    method public static final int myPid();

    method @NonNull public static String myProcessName();

core/api/module-lib-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ package android.content.pm { 


  public abstract class PackageManager {

    method @NonNull public String getPermissionControllerPackageName();

    method @NonNull public String getSupplementalProcessPackageName();

    method @NonNull public String getSdkSandboxPackageName();

    field public static final int MATCH_STATIC_SHARED_AND_SDK_LIBRARIES = 67108864; // 0x4000000

  }
@@ -362,9 +362,9 @@ package android.os { 
  }



  public class Process {

    method public static final boolean isSupplemental(int);

    method public static final boolean isSdkSandboxUid(int);

    method public static final int toAppUid(int);

    method public static final int toSupplementalUid(int);

    method public static final int toSdkSandboxUid(int);

    field public static final int NFC_UID = 1027; // 0x403

    field public static final int VPN_UID = 1016; // 0x3f8

  }

core/api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -826,9 +826,9 @@ package android.content.pm { 
    method @NonNull public java.util.List<android.content.pm.ApplicationInfo> getInstalledApplicationsAsUser(@NonNull android.content.pm.PackageManager.ApplicationInfoFlags, int);

    method @Nullable public abstract String[] getNamesForUids(int[]);

    method @NonNull public String getPermissionControllerPackageName();

    method @NonNull public String getSdkSandboxPackageName();

    method @NonNull public abstract String getServicesSystemSharedLibraryPackageName();

    method @NonNull public abstract String getSharedSystemSharedLibraryPackageName();

    method @NonNull public String getSupplementalProcessPackageName();

    method @Nullable public String getSystemTextClassifierPackageName();

    method @Nullable public String getWellbeingPackageName();

    method public void holdLock(android.os.IBinder, int);
@@ -1774,7 +1774,7 @@ package android.os { 


  public class Process {

    method public static final int getThreadScheduler(int) throws java.lang.IllegalArgumentException;

    method public static final int toSupplementalUid(int);

    method public static final int toSdkSandboxUid(int);

    field public static final int FIRST_APP_ZYGOTE_ISOLATED_UID = 90000; // 0x15f90

    field public static final int FIRST_ISOLATED_UID = 99000; // 0x182b8

    field public static final int LAST_APP_ZYGOTE_ISOLATED_UID = 98999; // 0x182b7

core/java/android/app/ApplicationPackageManager.java

+2 −2
Original line number Diff line number Diff line
@@ -867,9 +867,9 @@ public class ApplicationPackageManager extends PackageManager { 
     * @hide

     */

    @Override

    public String getSupplementalProcessPackageName() {

    public String getSdkSandboxPackageName() {

        try {

            return mPM.getSupplementalProcessPackageName();

            return mPM.getSdkSandboxPackageName();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }