From a416d984b0699d495ece492786e45d4c77fa67ad Mon Sep 17 00:00:00 2001 From: Malcolm Chen Date: Fri, 18 Oct 2019 17:05:16 -0700 Subject: [PATCH] Have getSupportedModemCount always rely on system properties. Earlier we disabled the reboot free feature and always have getSupportedModemCount return the same value with getActiveModemCount. Now that we've enbaled reboot free switch, we will return correct value based on system property. Bug: 142514392 Test: manual - change PROPERTY_REBOOT_REQUIRED_ON_MODEM_CHANGE and test what getSupportedModemCount returns. Change-Id: I34e172c747dd52aa498037e64b758393793fddba --- .../java/android/telephony/TelephonyManager.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 03e57e728610f..bab1329eeab2c 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -424,18 +424,8 @@ public class TelephonyManager { * {@link #getActiveModemCount} returns 1 while this API returns 2. */ public @ModemCount int getSupportedModemCount() { - // TODO: b/139642279 when turning on this feature, remove dependency of - // PROPERTY_REBOOT_REQUIRED_ON_MODEM_CHANGE and always return result based on - // PROPERTY_MAX_ACTIVE_MODEMS. - String rebootRequired = SystemProperties.get( - TelephonyProperties.PROPERTY_REBOOT_REQUIRED_ON_MODEM_CHANGE); - if (rebootRequired.equals("false")) { - // If no reboot is required, return max possible active modems. - return SystemProperties.getInt( - TelephonyProperties.PROPERTY_MAX_ACTIVE_MODEMS, getPhoneCount()); - } else { - return getPhoneCount(); - } + return SystemProperties.getInt(TelephonyProperties.PROPERTY_MAX_ACTIVE_MODEMS, + getActiveModemCount()); } /** {@hide} */