Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84f7a57a authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

Merge "Remove references to NV reset APIs" into main

parents 9bcae821 b5446d24

src/java/com/android/internal/telephony/Phone.java

+2 −0
Original line number Diff line number Diff line
@@ -2821,6 +2821,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
     * @param response Callback message.

     */

    public void resetModemConfig(Message response) {

        if (mFeatureFlags.cleanupCdma()) return;

        mCi.nvResetConfig(3 /* factory NV reset */, response);

    }
@@ -2830,6 +2831,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
     * @param response Callback message.

     */

    public void eraseModemConfig(Message response) {

        if (mFeatureFlags.cleanupCdma()) return;

        mCi.nvResetConfig(2 /* erase NV */, response);

    }

src/java/com/android/internal/telephony/RILUtils.java

+9 −0
Original line number Diff line number Diff line
@@ -387,6 +387,7 @@ import com.android.internal.telephony.cdma.sms.CdmaSmsSubaddress; 
import com.android.internal.telephony.cdma.sms.SmsEnvelope;

import com.android.internal.telephony.data.KeepaliveStatus;

import com.android.internal.telephony.data.KeepaliveStatus.KeepaliveStatusCode;

import com.android.internal.telephony.flags.Flags;

import com.android.internal.telephony.imsphone.ImsCallInfo;

import com.android.internal.telephony.uicc.AdnCapacity;

import com.android.internal.telephony.uicc.IccCardApplicationStatus;
@@ -1173,6 +1174,10 @@ public class RILUtils { 
         * 2 - erase NV reset (SCRTN)

         * 3 - factory reset (RTN)

         */

        if (Flags.cleanupCdma()) {

            if (resetType == 1) return android.hardware.radio.V1_0.ResetNvType.RELOAD;

            return -1;

        }

        switch (resetType) {

            case 1: return android.hardware.radio.V1_0.ResetNvType.RELOAD;

            case 2: return android.hardware.radio.V1_0.ResetNvType.ERASE;
@@ -1193,6 +1198,10 @@ public class RILUtils { 
         * 2 - erase NV reset (SCRTN)

         * 3 - factory reset (RTN)

         */

        if (Flags.cleanupCdma()) {

            if (resetType == 1) return android.hardware.radio.modem.ResetNvType.RELOAD;

            return -1;

        }

        switch (resetType) {

            case 1: return android.hardware.radio.modem.ResetNvType.RELOAD;

            case 2: return android.hardware.radio.modem.ResetNvType.ERASE;