Merge "multiSimAllowed should be consistent with max active modem property." into rvc-dev am: e025fcef40 am: 8c3fee86ff am: 4dca1a242f

Change-Id: If1da283aaf338e1383abb4cda75b416a833ad8db
2020-04-03 01:28:08 +00:00
parent bbda44e3e7 4dca1a242f
commit 62bf9b5cde
1 changed files with 3 additions and 0 deletions
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -12346,6 +12346,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) {