Merge "Expose RoleManager#getDefaultSmsPackage"

This commit is contained in:
Hall Liu
2020-09-25 21:37:39 +00:00
committed by Android (Google) Code Review
4 changed files with 19 additions and 0 deletions

View File

@@ -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 {

View File

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

View File

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

View File

@@ -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 {