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

Commit 4998ea41 authored by Hall Liu's avatar Hall Liu Committed by Android (Google) Code Review
Browse files

Merge "Expose RoleManager#getDefaultSmsPackage"

parents bcdc2128 eb0af200

api/module-lib-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,14 @@ package android.app { 


}



package android.app.role {



  public final class RoleManager {

    method @Nullable public String getDefaultSmsPackage(int);

  }



}



package android.content.rollback {



  public class RollbackManagerFrameworkInitializer {

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -766,6 +766,7 @@ package android.app.role { 
    method @RequiresPermission("android.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.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.permission.MANAGE_ROLE_HOLDERS") public java.util.List<java.lang.String> getRoleHolders(@NonNull String);

    method @NonNull @RequiresPermission("android.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

+2 −0
Original line number Diff line number Diff line
@@ -634,6 +634,8 @@ public final class RoleManager { 
     * @hide

     */

    @Nullable

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @TestApi

    public String getDefaultSmsPackage(@UserIdInt int userId) {

        try {

            return mService.getDefaultSmsPackage(userId);

non-updatable-api/module-lib-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,14 @@ package android.app { 


}



package android.app.role {



  public final class RoleManager {

    method @Nullable public String getDefaultSmsPackage(int);

  }



}



package android.content.rollback {



  public class RollbackManagerFrameworkInitializer {