Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I94348aa1eaa0f499c2aa8ee8e539dc6c6309451a
This commit is contained in:
Etienne Ruffieux
2022-03-07 19:30:12 +00:00
committed by Automerger Merge Worker
parent a310be7161 a6f8e92f13
commit 563f940c10
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/android/telephony/SubscriptionManager.java
View File

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