commit 2159ca20d0eb9d900c315a3ad4ed60225be75500
author Tomasz Wasilczyk <twasilczyk@google.com> Thu Jul 25 13:54:35 2024 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> Wed Jul 31 05:47:49 2024 +0000
tree 4cf3532dc7b9e075dfa9a0eca3a4bdb0703356e2
parent 9dd7a7a587d643409bf81bea183e0efade3a0456

Factory reset: don't crash if IMS feature is absent

Bug: 355455324
Test: atest TelephonyManagerTest
Flag: EXEMPT bugfix
Change-Id: Id1fdafafa07661d080812f4f65e5e337efa2a013

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 6dc2add..a1d6ec6 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -8593,7 +8593,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();
             }