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

Commit 65597c8d 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

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

Change-Id: I9d5899189f0a23f41ce722953ee7661f18d0450e
parents b19193da 8ed9eead
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ public class DataConnection extends StateMachine {
        }
    }

    private ApnSetting mApnSetting;
    private volatile ApnSetting mApnSetting;
    private ConnectionParams mConnectionParams;
    private DisconnectParams mDisconnectParams;
    @DataFailureCause
@@ -3365,6 +3365,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));