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

Commit 378a4380 authored by Kazuhiro Ondo's avatar Kazuhiro Ondo Committed by Wink Saville
Browse files

Reset FAILED ApnContext state to IDLE on data setup triggers 

Make sure FAILED ApnContext state is reset to IDLE regarless of
existence of the reconnect alarm. This is to let FW re-evaluate
call setup conditions properly on data setup triggers.

Bug: 4989604
Change-Id: Ia9ec439db1df03bbd2e56803d3558542ba5f5400
parent c8e2916d

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