commit d13a12c6f40ff004743a861bed820d8b35ff87bb
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Apr 03 18:41:38 2025 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Apr 03 18:41:38 2025 -0700
tree af02cb6379c9912aed262d8e9a5acab27f3bbf06
parent b5f6b84933f8421e67e1121224656c55ce38d445
parent 6cc79f73345887e17387499e1b5c5dc742c69af0

Merge cherrypicks of ['googleplex-android-review.googlesource.com/32666722'] into 25Q2-release.

Change-Id: Ic26de0d5cf701647303e94f6ea1dae48ec4b1849

src/java/com/android/internal/telephony/uicc/UiccController.java

diff --git a/src/java/com/android/internal/telephony/uicc/UiccController.java b/src/java/com/android/internal/telephony/uicc/UiccController.java
index 5c2b6be..c242a1b 100644
--- a/src/java/com/android/internal/telephony/uicc/UiccController.java
+++ b/src/java/com/android/internal/telephony/uicc/UiccController.java
@@ -1665,7 +1665,7 @@
     }
 
     private boolean isValidPhoneIndex(int index) {
-        return (index >= 0 && index < TelephonyManager.getDefault().getPhoneCount());
+        return (index >= 0 && index < mTelephonyManager.getActiveModemCount());
     }
 
     private boolean isValidSlotIndex(int index) {
@@ -1673,7 +1673,7 @@
     }
 
     private boolean isShuttingDown() {
-        for (int i = 0; i < TelephonyManager.getDefault().getActiveModemCount(); i++) {
+        for (int i = 0; i < mTelephonyManager.getActiveModemCount(); i++) {
             if (PhoneFactory.getPhone(i) != null &&
                     PhoneFactory.getPhone(i).isShuttingDown()) {
                 return true;