commit fc494095dfcd4a184769a0943dfb8b15e52efed8
author Jack Yu <jackyu@google.com> Thu Dec 08 00:50:53 2022 -0800
committer Jack Yu <jackyu@google.com> Fri Mar 10 09:55:57 2023 -0800
tree e947f89ed15ac1b6b79ffaeba93ad871eecc3878
parent 793d1f0e5718f5f3db9a492c9b693fb968588a5d

Migrate getSimStateForSlotIndex to TelephonyManager

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

Test: Manual
Bug: 239607619
Merged-In: I18d5ff3a7b4b403e7694c45135ad8fb89a79c208
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 051d676..0b48c59 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -1005,7 +1005,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;
@@ -1096,7 +1096,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;