commit cab25c5509c989c96f6abed17ce049329af59ee2
author Ryan Savitski <rsavitski@google.com> Tue Mar 14 14:23:49 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 14 14:24:06 2023 +0000
tree e947f89ed15ac1b6b79ffaeba93ad871eecc3878
parent 8965f854244fe21b1e6078be9dbcb1d809490da2

Revert "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex t..."

Revert submission 2484175-revert-2481148-getSimStateForSlotIndex-UWFWFIPUUM

Reason for revert: reverting the revert as it caused build failures in downstream branches. Exact causes still TBD, see b/273394101.

Reverted changes: /q/submissionid:2484175-revert-2481148-getSimStateForSlotIndex-UWFWFIPUUM

Bug: 273394101
Change-Id: I21a11b312712e947fc609e83e2e651a38358d4ef

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;