Merge "Add intdef to subscription info record methods" am: 5ddd0bf68e am: acf465e769 am: de55c1fff9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1998850

Change-Id: If9003c519ff66d39c6394e2c3d5f6aa00373097a
This commit is contained in:
Etienne Ruffieux
2022-03-07 19:08:28 +00:00
committed by Automerger Merge Worker

View File

@@ -1976,7 +1976,7 @@ public class SubscriptionManager {
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public void addSubscriptionInfoRecord(@NonNull String uniqueId, @Nullable String displayName,
int slotIndex, int subscriptionType) {
int slotIndex, @SubscriptionType int subscriptionType) {
if (VDBG) {
logd("[addSubscriptionInfoRecord]+ uniqueId:" + uniqueId
+ ", displayName:" + displayName + ", slotIndex:" + slotIndex
@@ -2012,7 +2012,8 @@ public class SubscriptionManager {
* @hide
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public void removeSubscriptionInfoRecord(@NonNull String uniqueId, int subscriptionType) {
public void removeSubscriptionInfoRecord(@NonNull String uniqueId,
@SubscriptionType int subscriptionType) {
if (VDBG) {
logd("[removeSubscriptionInfoRecord]+ uniqueId:" + uniqueId
+ ", subscriptionType: " + subscriptionType);