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

Commit 5b121e70 authored by Hui Wang's avatar Hui Wang Committed by Automerger Merge Worker
Browse files

Merge "Set apn setting immediately when calling bringUp" am: 8ed9eead am:... 

Merge "Set apn setting immediately when calling bringUp" am: 8ed9eead am: 65597c8d am: dcfda3e3

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1546778

Change-Id: I5b0f8c5c217d6b5f444c9a874258df214b076e8c
parents aeffe60b dcfda3e3

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+6 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ public class DataConnection extends StateMachine { 
        }

    }



    private ApnSetting mApnSetting;

    private volatile ApnSetting mApnSetting;

    private ConnectionParams mConnectionParams;

    private DisconnectParams mDisconnectParams;

    @DataFailureCause
@@ -3463,6 +3463,11 @@ public class DataConnection extends StateMachine { 
        if (DBG) {

            log("bringUp: apnContext=" + apnContext + " onCompletedMsg=" + onCompletedMsg);

        }



        if (mApnSetting == null) {

            mApnSetting = apnContext.getApnSetting();

        }



        sendMessage(DataConnection.EVENT_CONNECT,

                new ConnectionParams(apnContext, profileId, rilRadioTechnology, onCompletedMsg,

                        connectionGeneration, requestType, subId, isApnPreferred));