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

Merge "Have isValidPhoneId and isValidSlotIndex based on activeModemCount." am: 300a0262b9

Browse Source 
am: b05c6d8fa6

Change-Id: If3dfcac1f8a4a46231f428aebc14f98ee16bc4e2
This commit is contained in:
Jack Yu
2019-11-05 10:09:08 -08:00
committed by android-build-merger
parent f2d84d6f53 b05c6d8fa6
commit 4fa762e52a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2101,13 +2101,13 @@ public class SubscriptionManager {
/** @hide */ /** @hide */
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
public static boolean isValidSlotIndex(int slotIndex) { public static boolean isValidSlotIndex(int slotIndex) {
return slotIndex >= 0 && slotIndex < TelephonyManager.getDefault().getSupportedModemCount(); return slotIndex >= 0 && slotIndex < TelephonyManager.getDefault().getActiveModemCount();
} }
/** @hide */ /** @hide */
@UnsupportedAppUsage @UnsupportedAppUsage
public static boolean isValidPhoneId(int phoneId) { public static boolean isValidPhoneId(int phoneId) {
return phoneId >= 0 && phoneId < TelephonyManager.getDefault().getSupportedModemCount(); return phoneId >= 0 && phoneId < TelephonyManager.getDefault().getActiveModemCount();
} }
/** @hide */ /** @hide */