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

Commit c349e59e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Hide RoleManager#getDefaultSmsPackage" into rvc-dev am: 1b243291 

Change-Id: I01ff9432a3ed143e8c18621da405b3e8d37895aa
parents dbbc3e59 1b243291

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -1372,7 +1372,6 @@ package android.app.role { 
    method @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public void addRoleHolderAsUser(@NonNull String, @NonNull String, int, @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);

    method @RequiresPermission("com.android.permissioncontroller.permission.MANAGE_ROLES_FROM_CONTROLLER") public boolean addRoleHolderFromController(@NonNull String, @NonNull String);

    method @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public void clearRoleHoldersAsUser(@NonNull String, int, @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);

    method @Nullable public String getDefaultSmsPackage(int);

    method @NonNull @RequiresPermission("com.android.permissioncontroller.permission.MANAGE_ROLES_FROM_CONTROLLER") public java.util.List<java.lang.String> getHeldRolesFromController(@NonNull String);

    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public java.util.List<java.lang.String> getRoleHolders(@NonNull String);

    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_ROLE_HOLDERS) public java.util.List<java.lang.String> getRoleHoldersAsUser(@NonNull String, @NonNull android.os.UserHandle);

core/java/android/app/role/RoleManager.java

+0 −1
Original line number Diff line number Diff line
@@ -636,7 +636,6 @@ public final class RoleManager { 
     * @hide

     */

    @Nullable

    @SystemApi

    public String getDefaultSmsPackage(@UserIdInt int userId) {

        try {

            return mService.getDefaultSmsPackage(userId);