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

Commit 37f94a7e authored by Yi-an Chen's avatar Yi-an Chen Committed by Android (Google) Code Review
Browse files

Merge "Upgrade getPermissionControllerPackageName to SystemApi" into main

parents 1dfb1652 445f661f

core/api/module-lib-current.txt

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



  public abstract class PackageManager {

    method @NonNull public String getPermissionControllerPackageName();

    method @NonNull public String getSdkSandboxPackageName();

    method @RequiresPermission(android.Manifest.permission.MAKE_UID_VISIBLE) public void makeUidVisible(int, int);

    field public static final String EXTRA_VERIFICATION_ROOT_HASH = "android.content.pm.extra.VERIFICATION_ROOT_HASH";

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3916,6 +3916,7 @@ package android.content.pm { 
    method @Deprecated @NonNull public abstract java.util.List<android.content.pm.IntentFilterVerificationInfo> getIntentFilterVerifications(@NonNull String);

    method @Deprecated @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public abstract int getIntentVerificationStatusAsUser(@NonNull String, int);

    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public int getPackageUidAsUser(@NonNull String, @NonNull android.content.pm.PackageManager.PackageInfoFlags, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method @NonNull public String getPermissionControllerPackageName();

    method @android.content.pm.PackageManager.PermissionFlags @RequiresPermission(anyOf={android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS, android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS, android.Manifest.permission.GET_RUNTIME_PERMISSIONS}) public abstract int getPermissionFlags(@NonNull String, @NonNull String, @NonNull android.os.UserHandle);

    method @NonNull @RequiresPermission(android.Manifest.permission.SUSPEND_APPS) public String[] getUnsuspendablePackages(@NonNull String[]);

    method @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS) public abstract void grantRuntimePermission(@NonNull String, @NonNull String, @NonNull android.os.UserHandle);

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

+2 −2
Original line number Diff line number Diff line
@@ -6279,9 +6279,9 @@ public abstract class PackageManager { 
     * @hide

     */

    @NonNull

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @SystemApi

    @TestApi

    @UnsupportedAppUsage

    @SuppressLint("UnflaggedApi") // Promoting from @SystemApi(MODULE_LIBRARIES)

    public String getPermissionControllerPackageName() {

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

    }