diff options
6 files changed, 6 insertions, 6 deletions
diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt index 4a7c1210267e..3801e1d34b06 100644 --- a/api/module-lib-current.txt +++ b/api/module-lib-current.txt @@ -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); } } diff --git a/api/test-current.txt b/api/test-current.txt index 054005444dee..68d28233ade0 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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); diff --git a/core/java/android/app/role/RoleManager.java b/core/java/android/app/role/RoleManager.java index 26edba36fdba..87e1df3fb234 100644 --- a/core/java/android/app/role/RoleManager.java +++ b/core/java/android/app/role/RoleManager.java @@ -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) { diff --git a/non-updatable-api/module-lib-current.txt b/non-updatable-api/module-lib-current.txt index 11cd6a93910e..003a36316c9b 100644 --- a/non-updatable-api/module-lib-current.txt +++ b/non-updatable-api/module-lib-current.txt @@ -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); } } diff --git a/telephony/common/com/android/internal/telephony/SmsApplication.java b/telephony/common/com/android/internal/telephony/SmsApplication.java index b35b3236afc6..c3cd01738b96 100644 --- a/telephony/common/com/android/internal/telephony/SmsApplication.java +++ b/telephony/common/com/android/internal/telephony/SmsApplication.java @@ -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); } /** diff --git a/tests/TelephonyCommonTests/src/com/android/internal/telephony/tests/SmsApplicationTest.java b/tests/TelephonyCommonTests/src/com/android/internal/telephony/tests/SmsApplicationTest.java index 83fd20803ed8..8013bd8c32f5 100644 --- a/tests/TelephonyCommonTests/src/com/android/internal/telephony/tests/SmsApplicationTest.java +++ b/tests/TelephonyCommonTests/src/com/android/internal/telephony/tests/SmsApplicationTest.java @@ -130,7 +130,7 @@ public class SmsApplicationTest { when(mTelephonyManager.isSmsCapable()).thenReturn(true); when(mRoleManager.isRoleAvailable(RoleManager.ROLE_SMS)).thenReturn(true); - when(mRoleManager.getDefaultSmsPackage(anyInt())) + when(mRoleManager.getSmsRoleHolder(anyInt())) .thenReturn(TEST_COMPONENT_NAME.getPackageName()); for (String opStr : APP_OPS_TO_CHECK) { |