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

Commit 6afac8b2 authored by Yong Zhang's avatar Yong Zhang Committed by Wink Saville
Browse files

Increase waiting time for data disable action in setPowerStateToDesired(). 

The issue this change fixes is that phone did not send MIP deregisteration
and LCP termination message when user powered down phone while data call was
in dormant state.  The root cause is Framework Telephony did not wait long
enough before it sent the request to power off the radio. The fix is to
increase the waiting timer.
parent 977e67bb

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

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ public abstract class ServiceStateTracker extends Handler { 
    // waiting period before recheck gprs and voice registration

    public static final int DEFAULT_GPRS_CHECK_PERIOD_MILLIS = 60 * 1000;



    public static final int MAX_NUM_DATA_STATE_READS = 15;

    public static final int DATA_STATE_POLL_SLEEP_MS = 100;



    //*****GSM events

telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

+4 −3
Original line number Diff line number Diff line
@@ -504,9 +504,10 @@ final class CdmaServiceStateTracker extends ServiceStateTracker { 
            msg.obj = CDMAPhone.REASON_RADIO_TURNED_OFF;

            dcTracker.sendMessage(msg);



            // Poll data state up to 15 times, with a 100ms delay

            // totaling 1.5 sec. Normal data disable action will finish in 100ms.

            for (int i = 0; i < MAX_NUM_DATA_STATE_READS; i++) {

            // Poll data state up to 50 times, with a 100ms delay

            // totaling 5 sec.

            // TODO: change the 5 seconds wait from blocking to non-blocking.

            for (int i = 0; i < 50; i++) {

                DataConnectionTracker.State currentState = dcTracker.getState();

                if (currentState != DataConnectionTracker.State.CONNECTED

                        && currentState != DataConnectionTracker.State.DISCONNECTING) {

telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

+2 −0
Original line number Diff line number Diff line
@@ -151,6 +151,8 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
    static final int PS_NOTIFICATION = 888; //id to update and cancel PS restricted

    static final int CS_NOTIFICATION = 999; //id to update and cancel CS restricted



    static final int MAX_NUM_DATA_STATE_READS = 15;



    private ContentObserver mAutoTimeObserver = new ContentObserver(new Handler()) {

        @Override

        public void onChange(boolean selfChange) {