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

Change-Id: I0a650dca2cc96298fd8e1135ea233ea56af3dc25
2020-04-03 00:50:04 +00:00
parent b5bfcffbb1 e025fcef40
commit 8c3fee86ff
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) {