commit 8965f854244fe21b1e6078be9dbcb1d809490da2
author Sebastian Pickl <spickl@google.com> Mon Mar 13 10:28:57 2023 +0000
committer Jack Yu <jackyu@google.com> Mon Mar 13 18:25:04 2023 +0000
tree c104b865b83605c93070e9a6bbfa506c16907d0c
parent fc494095dfcd4a184769a0943dfb8b15e52efed8

[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex to TelephonyManager"

Revert submission 2481148-getSimStateForSlotIndex

Reason for revert: trying to find culprit for https://android-build.googleplex.com/builds/tests/view?testResultId=TR96728544297958511&legacy=&invocationId=I86700010138773900

Reverted changes: /q/submissionid:2481148-getSimStateForSlotIndex

Change-Id: I830454a1a1280db8e4cadcae427ae088b29ae38f

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 0b48c59..051d676 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 (TelephonyManager.getSimStateForSlotIndex(phoneId)
+            if (SubscriptionManager.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 (TelephonyManager.getSimStateForSlotIndex(phoneId)
+            if (SubscriptionManager.getSimStateForSlotIndex(phoneId)
                     != TelephonyManager.SIM_STATE_LOADED) {
                 loge("Skip restore config because SIM records are not loaded.");
                 return null;