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

Merge "Remove isActivePhoneId as it's moved to PhoneConfigurationManager." am: 6ddfde96fd am: fd5d074f49

Browse Source 
am: 914861c2e0

Change-Id: Ibcdf9922d0be31508f22cee3fc6e5b76d26f1df7
This commit is contained in:
Xiangyu/Malcolm Chen
2019-10-15 14:04:56 -07:00
committed by android-build-merger
parent a99f27b4a4 914861c2e0
commit 281e4ef4ec
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2104,19 +2104,6 @@ public class SubscriptionManager {
return phoneId >= 0 && phoneId < TelephonyManager.getDefault().getMaxPhoneCount(); return phoneId >= 0 && phoneId < TelephonyManager.getDefault().getMaxPhoneCount();
} }
/**
* When getPhoneCount and getMaxPhoneCount return different value, isValidPhoneId being true
* doesn't mean the phoneId has a corresponding active slot / logical modem. If a DSDS capable
* device is in single SIM mode, phoneId=1 is valid but not active.
*
* TODO: b/139642279 combine with SubscriptionManager#isValidPhoneId when phone objects
* are dynamically allocated instead of always based on getMaxPhoneCount.
* @hide
*/
public static boolean isActivePhoneId(int slotIndex) {
return slotIndex < TelephonyManager.getDefault().getPhoneCount();
}
/** @hide */ /** @hide */
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId) { public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId) {