diff options
| author | Jack Yu <jackyu@google.com> | 2017-08-06 10:13:16 -0700 |
|---|---|---|
| committer | Jack Yu <jackyu@google.com> | 2017-08-06 10:13:16 -0700 |
| commit | 2c5f018199a1e263576f8e456377d162011e3240 (patch) | |
| tree | 2468af6d664d7ed06db45de5943d7fb8fa14f463 | |
| parent | f97040889a1f970346a92c6e272ab4a58823287c (diff) | |
| download | telephony-2c5f018199a1e263576f8e456377d162011e3240.tar.gz | |
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
| -rw-r--r-- | src/java/com/android/internal/telephony/dataconnection/DataConnection.java | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java index ba2544ded3..7c5f503b4b 100644 --- a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java +++ b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java @@ -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"; - 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)); - } + + 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)); } private void notifyAllWithEvent(ApnContext alreadySent, int event, String reason) { |