From c6910afb5d82eb2769d0c00dabb0b9731c591c65 Mon Sep 17 00:00:00 2001
From: Malcolm Chen <refuhoo@google.com>
Date: Thu, 2 Apr 2020 10:54:50 -0700
Subject: [PATCH] multiSimAllowed should be consistent with max active modem
 property.

Bug: 153023231
Test: manual - using test app
Change-Id: I2d38dd9a0a860ee451fe51372a62c2910b88c88f
Merged-In: I2d38dd9a0a860ee451fe51372a62c2910b88c88f
---
 telephony/java/android/telephony/TelephonyManager.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 059692de134ed..a758a1d12a5e0 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -12230,6 +12230,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) {