commit e025fcef40747e94f1d5e69a61a3e4f43c6abdf7
author Xiangyu/Malcolm Chen <refuhoo@google.com> Fri Apr 03 00:43:30 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 03 00:43:30 2020 +0000
tree 026a752360301e873086e0eae4055759af279201
parent 8ad7c0ec42789667cd0d9945feadaf275824b9d3
parent ba874c682787cc198899c576abb52d33ab43309e

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

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 4e5be5c..9ae905d 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -12344,6 +12344,9 @@
     @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) {