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

Commit df43e321 authored by Wink Saville's avatar Wink Saville Committed by Android (Google) Code Review
Browse files

Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE

parents dc26a0c8 157f9a04

telephony/java/com/android/internal/telephony/ServiceStateTracker.java

+2 −2
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ public abstract class ServiceStateTracker extends Handler { 
        synchronized (this) {

            if (!mPendingRadioPowerOffAfterDataOff) {

                if (dcTracker.isAnyActiveDataConnections()) {

                    dcTracker.cleanUpAllConnections(null);

                    dcTracker.cleanUpAllConnections(Phone.REASON_RADIO_TURNED_OFF);

                    Message msg = Message.obtain(this);

                    msg.what = EVENT_SET_RADIO_POWER_OFF;

                    msg.arg1 = ++mPendingRadioPowerOffAfterDataOffTag;
@@ -410,7 +410,7 @@ public abstract class ServiceStateTracker extends Handler { 
                        hangupAndPowerOff();

                    }

                } else {

                    dcTracker.cleanUpAllConnections(null);

                    dcTracker.cleanUpAllConnections(Phone.REASON_RADIO_TURNED_OFF);

                    if (DBG) log("Data disconnected, turn off radio right away.");

                    hangupAndPowerOff();

                }