commit 3ae4c4bf6a2a2618961c6f0d838d1ce7cbc6142b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Aug 01 20:38:29 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 01 20:38:29 2024 +0000
tree 72c7b6a15cd620ae73b80d20c47fd130a9064560
parent 399c7622cf327eba0f97f7cabc911d0646b504d7
parent 2159ca20d0eb9d900c315a3ad4ed60225be75500

Merge "Factory reset: don't crash if IMS feature is absent" into main

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 41e8647..33ea71a 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -8605,7 +8605,7 @@
             cleanUpSmsRawTable(getDefaultPhone().getContext());
             // Clean up IMS settings as well here.
             int slotId = getSlotIndex(subId);
-            if (slotId > SubscriptionManager.INVALID_SIM_SLOT_INDEX) {
+            if (isImsAvailableOnDevice() && slotId > SubscriptionManager.INVALID_SIM_SLOT_INDEX) {
                 ImsManager.getInstance(mApp, slotId).factoryReset();
             }