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;
