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

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

Merge "Rename RoleManager#getDefaultSmsPackage"

parents 2383d074 0b7bf46c

api/module-lib-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package android.app { 
package android.app.role {



  public final class RoleManager {

    method @Nullable public String getDefaultSmsPackage(int);

    method @Nullable public String getSmsRoleHolder(int);

  }



}

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -767,10 +767,10 @@ 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);

    method @Nullable public String getSmsRoleHolder(int);

    method @RequiresPermission("android.permission.OBSERVE_ROLE_HOLDERS") public void removeOnRoleHoldersChangedListenerAsUser(@NonNull android.app.role.OnRoleHoldersChangedListener, @NonNull android.os.UserHandle);

    method @RequiresPermission("android.permission.MANAGE_ROLE_HOLDERS") public void removeRoleHolderAsUser(@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 removeRoleHolderFromController(@NonNull String, @NonNull String);

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

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ public final class RoleManager { 
    @Nullable

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @TestApi

    public String getDefaultSmsPackage(@UserIdInt int userId) {

    public String getSmsRoleHolder(@UserIdInt int userId) {

        try {

            return mService.getDefaultSmsPackage(userId);

        } catch (RemoteException e) {

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

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package android.app { 
package android.app.role {



  public final class RoleManager {

    method @Nullable public String getDefaultSmsPackage(int);

    method @Nullable public String getSmsRoleHolder(int);

  }



}

telephony/common/com/android/internal/telephony/SmsApplication.java

+1 −1
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ public final class SmsApplication { 
    }



    private static String getDefaultSmsPackage(Context context, int userId) {

        return context.getSystemService(RoleManager.class).getDefaultSmsPackage(userId);

        return context.getSystemService(RoleManager.class).getSmsRoleHolder(userId);

    }



    /**