From eb0af2008ff82a613618c3ed6d886f00d5f69499 Mon Sep 17 00:00:00 2001 From: Hall Liu Date: Thu, 24 Sep 2020 13:56:54 -0700 Subject: [PATCH] Expose RoleManager#getDefaultSmsPackage Expose this method for module libraries. It's needed to support a public method in TelephonyProvider that doesn't require any permissions. Test: atest RoleManagerTest#smsRoleHolderAvailableWithoutObserveRoleHolders Fixes: 169350676 Change-Id: Ia2725dc5aa0de74b2cf67ecd0666917ae27adda9 --- api/module-lib-current.txt | 8 ++++++++ api/test-current.txt | 1 + core/java/android/app/role/RoleManager.java | 2 ++ non-updatable-api/module-lib-current.txt | 8 ++++++++ 4 files changed, 19 insertions(+) diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt index d27f5a5c006e8..f5bf78783ac82 100644 --- a/api/module-lib-current.txt +++ b/api/module-lib-current.txt @@ -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 { diff --git a/api/test-current.txt b/api/test-current.txt index 5082c57cd2210..3a96618028f14 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -765,6 +765,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); 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); + method @Nullable public String getDefaultSmsPackage(int); method @NonNull @RequiresPermission("com.android.permissioncontroller.permission.MANAGE_ROLES_FROM_CONTROLLER") public java.util.List getHeldRolesFromController(@NonNull String); method @NonNull @RequiresPermission("android.permission.MANAGE_ROLE_HOLDERS") public java.util.List getRoleHolders(@NonNull String); method @NonNull @RequiresPermission("android.permission.MANAGE_ROLE_HOLDERS") public java.util.List getRoleHoldersAsUser(@NonNull String, @NonNull android.os.UserHandle); diff --git a/core/java/android/app/role/RoleManager.java b/core/java/android/app/role/RoleManager.java index 253c73796caf2..26edba36fdba4 100644 --- a/core/java/android/app/role/RoleManager.java +++ b/core/java/android/app/role/RoleManager.java @@ -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); diff --git a/non-updatable-api/module-lib-current.txt b/non-updatable-api/module-lib-current.txt index 85136df0d1adc..bcab49ba78c78 100644 --- a/non-updatable-api/module-lib-current.txt +++ b/non-updatable-api/module-lib-current.txt @@ -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 {