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

Commit 9d5ac7bd authored by Ramesh Sudini's avatar Ramesh Sudini Committed by Android Git Automerger
Browse files

am dcbba67a: Telephony: Fix merge issue "Set enabled state before notification is sent out." 

* commit 'dcbba67a':
  Telephony: Fix merge issue "Set enabled state before notification is sent out."
parents 7f90b316 dcbba67a

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

+1 −2
Original line number Diff line number Diff line
@@ -1596,13 +1596,12 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
        apnContext.setState(State.IDLE);

        apnContext.setApnSetting(null);



        mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType());



        // Check if APN disabled.

        if (apnContext.getPendingAction() == ApnContext.PENDING_ACTION_APN_DISABLE) {

           apnContext.setEnabled(false);

           apnContext.setPendingAction(ApnContext.PENDING_ACTION_NONE);

        }

        mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType());



        // if all data connection are gone, check whether Airplane mode request was

        // pending.