commit f5badd93969d832db1e1c9c75ce3f8e9665cac20
author Jack Yu <jackyu@google.com> Thu Dec 08 00:50:53 2022 -0800
committer Jack Yu <jackyu@google.com> Thu Dec 08 10:24:01 2022 -0800
tree ff523d4d1f210cca85e7a1db5bc3533881dd0c98
parent 0713ba22b8cd9dcb8cfbb14278a0640577c21d30

Migrate getSimStateForSlotIndex to TelephonyManager

Most of the SIM APIs are in TelephonyManager. SubscriptionManager
handles subscription related information only.

Test: Manual
Bug: 239607619
Change-Id: I18d5ff3a7b4b403e7694c45135ad8fb89a79c208

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index a270e07..44375bb 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -978,7 +978,7 @@
         if (isNoSimConfig) {
             fileName = getFilenameForNoSimConfig(packageName);
         } else {
-            if (SubscriptionManager.getSimStateForSlotIndex(phoneId)
+            if (TelephonyManager.getSimStateForSlotIndex(phoneId)
                     != TelephonyManager.SIM_STATE_LOADED) {
                 loge("Skip save config because SIM records are not loaded.");
                 return;
@@ -1069,7 +1069,7 @@
         if (isNoSimConfig) {
             fileName = getFilenameForNoSimConfig(packageName);
         } else {
-            if (SubscriptionManager.getSimStateForSlotIndex(phoneId)
+            if (TelephonyManager.getSimStateForSlotIndex(phoneId)
                     != TelephonyManager.SIM_STATE_LOADED) {
                 loge("Skip restore config because SIM records are not loaded.");
                 return null;