Merge "multiSimAllowed should be consistent with max active modem property." am: 2641543774

Change-Id: Ica601a83a63c10f7c6403634e0fd5a4db63b3865
This commit is contained in:
Xiangyu/Malcolm Chen
2020-04-08 01:07:20 +00:00
committed by Automerger Merge Worker

View File

@@ -12203,6 +12203,9 @@ public class TelephonyManager {
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
@IsMultiSimSupportedResult @IsMultiSimSupportedResult
public int isMultiSimSupported() { public int isMultiSimSupported() {
if (getSupportedModemCount() < 2) {
return TelephonyManager.MULTISIM_NOT_SUPPORTED_BY_HARDWARE;
}
try { try {
ITelephony service = getITelephony(); ITelephony service = getITelephony();
if (service != null) { if (service != null) {