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

Commit e5cac878 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Android (Google) Code Review
Browse files

Merge "Teach PackageManagerService about supplemental process"

parents b771f833 05b17e19

core/api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ package android.content.pm { 


  public abstract class PackageManager {

    method @NonNull public String getPermissionControllerPackageName();

    method @NonNull public String getSupplementalProcessPackageName();

  }



}

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -801,6 +801,7 @@ package android.content.pm { 
    method @NonNull public String getPermissionControllerPackageName();

    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);

core/java/android/app/ApplicationPackageManager.java

+12 −0
Original line number Diff line number Diff line
@@ -863,6 +863,18 @@ public class ApplicationPackageManager extends PackageManager { 
        }

    }



    /**

     * @hide

     */

    @Override

    public String getSupplementalProcessPackageName() {

        try {

            return mPM.getSupplementalProcessPackageName();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @Override

    public boolean addPermission(PermissionInfo info) {

        return getPermissionManager().addPermission(info, false);

core/java/android/content/pm/IPackageManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -653,6 +653,7 @@ interface IPackageManager { 


    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    String getPermissionControllerPackageName();

    String getSupplementalProcessPackageName();



    ParceledListSlice getInstantApps(int userId);

    byte[] getInstantAppCookie(String packageName, int userId);

core/java/android/content/pm/PackageManager.java

+14 −0
Original line number Diff line number Diff line
@@ -5690,6 +5690,20 @@ public abstract class PackageManager { 
        throw new RuntimeException("Not implemented. Must override in a subclass.");

    }



    /**

     * Returns the package name of the component implementing supplemental process service.

     *

     * @return the package name of the component implementing supplemental process service

     *

     * @hide

     */

    @NonNull

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @TestApi

    public String getSupplementalProcessPackageName() {

        throw new RuntimeException("Not implemented. Must override in a subclass.");

    }



    /**

     * Add a new dynamic permission to the system.  For this to work, your

     * package must have defined a permission tree through the