commit 110676e5cef6843e14310016a2844fb72858f3cd
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Dec 07 04:15:28 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Dec 07 04:15:28 2024 +0000
tree 25e69b6fb6faff9632f537bf1a96187465e6b18a
parent 97a6bf27e370270b190e17f31e9d2944acd500ca
parent 58e46cad1c635a0b6fd061810c206905ce37e506

Merge "Fix minor Telephony crashes" 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 36ed19d..7cba4fc 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1836,7 +1836,7 @@
                 }
                 case CMD_MODEM_REBOOT:
                     request = (MainThreadRequest) msg.obj;
-                    onCompleted = obtainMessage(EVENT_RESET_MODEM_CONFIG_DONE, request);
+                    onCompleted = obtainMessage(EVENT_CMD_MODEM_REBOOT_DONE, request);
                     defaultPhone.rebootModem(onCompleted);
                     break;
                 case EVENT_CMD_MODEM_REBOOT_DONE:
@@ -2577,6 +2577,7 @@
     }
 
     private void sendEraseModemConfig(@NonNull Phone phone) {
+        if (mFeatureFlags.cleanupCdma()) return;
         Boolean success = (Boolean) sendRequest(CMD_ERASE_MODEM_CONFIG, null);
         if (DBG) log("eraseModemConfig:" + ' ' + (success ? "ok" : "fail"));
     }
@@ -6458,6 +6459,7 @@
      */
     @Override
     public boolean resetModemConfig(int slotIndex) {
+        if (mFeatureFlags.cleanupCdma()) return false;
         Phone phone = PhoneFactory.getPhone(slotIndex);
         if (phone != null) {
             TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(