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

Commit c29bd237 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Fixed deactivate data call request not sent while radio is off" 

am: b69ed3c0

Change-Id: I879e72efab1c7ea7f6119df8b565b58280ffcc0b
parents 7a4666cb b69ed3c0

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+6 −15
Original line number Diff line number Diff line
@@ -500,21 +500,12 @@ public class DataConnection extends StateMachine { 
                discReason = RILConstants.DEACTIVATE_REASON_PDP_RESET;

            }

        }

        if (mPhone.mCi.getRadioState().isOn()

                || (mPhone.getServiceState().getRilDataRadioTechnology()

                        == ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN )) {

            String str = "tearDownData radio is on, call deactivateDataCall";



        String str = "tearDownData. mCid=" + mCid + ", reason=" + discReason;

        if (DBG) log(str);

        if (apnContext != null) apnContext.requestLog(str);

        mPhone.mCi.deactivateDataCall(mCid, discReason,

                obtainMessage(EVENT_DEACTIVATE_DONE, mTag, 0, o));

        } else {

            String str = "tearDownData radio is off sendMessage EVENT_DEACTIVATE_DONE immediately";

            if (DBG) log(str);

            if (apnContext != null) apnContext.requestLog(str);

            AsyncResult ar = new AsyncResult(o, null, null);

            sendMessage(obtainMessage(EVENT_DEACTIVATE_DONE, mTag, 0, ar));

        }

    }



    private void notifyAllWithEvent(ApnContext alreadySent, int event, String reason) {