commit f1af36c5d077a5f0364a2ea5d498bf9d89ca39de
author Tomasz Wasilczyk <twasilczyk@google.com> Thu Dec 05 11:36:37 2024 -0800
committer Tomasz Wasilczyk <twasilczyk@google.com> Thu Dec 05 11:36:37 2024 -0800
tree 66d2dcd8e4196787b4956f15b6548c41b5c33cf5
parent 39ae90292e6d195449ed14baf162ecbfbeaec083

Remove references to NV reset APIs

Bug: 379356026
Test: m
Flag: com.android.internal.telephony.flags.cleanup_cdma
Change-Id: Iaa894f36101dbb5320e836cdf7050fd24485031a

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 1a645da..7ad35ed 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(