From a43e23fb38d4148b010afb648d3553bfdf699892 Mon Sep 17 00:00:00 2001
From: Malcolm Chen <refuhoo@google.com>
Date: Mon, 21 Oct 2019 14:22:18 -0700
Subject: [PATCH] Have isValidPhoneId and isValidSlotIndex based on
 activeModemCount.

Bug: 142514392
Test: sanity and unittest
Merged-In: Ia66ee24151d1ec8ecde2dcb4c824a19b4d2cd172
Change-Id: Ia66ee24151d1ec8ecde2dcb4c824a19b4d2cd172
(cherry picked from commit dde04f8f4afe453dd844a8b012320b7757cdf67c)
---
 telephony/java/android/telephony/SubscriptionManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index f27796e08ab29..3bd6578f337e7 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -2101,13 +2101,13 @@ public class SubscriptionManager {
     /** @hide */
     @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
     public static boolean isValidSlotIndex(int slotIndex) {
-        return slotIndex >= 0 && slotIndex < TelephonyManager.getDefault().getSupportedModemCount();
+        return slotIndex >= 0 && slotIndex < TelephonyManager.getDefault().getActiveModemCount();
     }
 
     /** @hide */
     @UnsupportedAppUsage
     public static boolean isValidPhoneId(int phoneId) {
-        return phoneId >= 0 && phoneId < TelephonyManager.getDefault().getSupportedModemCount();
+        return phoneId >= 0 && phoneId < TelephonyManager.getDefault().getActiveModemCount();
     }
 
     /** @hide */