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

Commit 2c5f0181 authored by Jack Yu's avatar Jack Yu
Browse files

Fixed deactivate data call request not sent while radio is off 

The data call deactivation request should be sent down regardless
of radio state. The data connection might be on IWLAN (wifi) without
radio turned on.

Test: Manual
bug: 63936310
Change-Id: I4483d4022e9aea7d11f22d092a6a7d315218ab82
parent f9704088

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) {