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

Commit 12f20ca2 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 19065008: am 48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data... 

am 19065008: am 48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE

* commit '19065008':
  Reset FAILED ApnContext state to IDLE on data setup triggers
parents 50e894c8 19065008

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

+7 −5
Original line number Diff line number Diff line
@@ -608,16 +608,18 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
                if (dcac.dataConnection != null) {

                    dcac.dataConnection.resetRetryCount();

                }



                Collection<ApnContext> apnList = dcac.getApnListSync();

                for (ApnContext apnContext : apnList) {

                    apnContext.setState(State.IDLE);

                }

            }

        }



        // Only check for default APN state

        for (ApnContext apnContext : mApnContexts.values()) {

            if (apnContext.getState() == State.FAILED) {

                // By this time, alarms for all failed Apns

                // should be stopped if any.

                // Make sure to set the state back to IDLE

                // so that setup data can happen.

                apnContext.setState(State.IDLE);

            }

            if (apnContext.isReady()) {

                if (apnContext.getState() == State.IDLE) {

                    apnContext.setReason(reason);