Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b556cb54 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I27be52b9990ce2c77c0b07b66a74319b606b122d
parents f4cf1a62 f4804c9e

telephony/java/android/telephony/TelephonyManager.java

+3 −0
Original line number Diff line number Diff line
@@ -12203,6 +12203,9 @@ public class TelephonyManager { 
    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @IsMultiSimSupportedResult

    public int isMultiSimSupported() {

        if (getSupportedModemCount() < 2) {

            return TelephonyManager.MULTISIM_NOT_SUPPORTED_BY_HARDWARE;

        }

        try {

            ITelephony service = getITelephony();

            if (service != null) {