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

Commit 4b435916 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "DataConnection fix race condition due to mApnSetting" into sc-dev am: 647ed5a4 

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

Change-Id: Ic6ec1a32f39acd67f5ce8e2e711fc41fd6f11642
parents f6850746 647ed5a4

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

+2 −2
Original line number Diff line number Diff line
@@ -1325,7 +1325,7 @@ public class DataConnection extends StateMachine { 
    /**

     * Clear all settings called when entering mInactiveState.

     */

    private void clearSettings() {

    private synchronized void clearSettings() {

        if (DBG) log("clearSettings");



        mCreateTime = -1;
@@ -3836,7 +3836,7 @@ public class DataConnection extends StateMachine { 
    }



    /** Doesn't print mApnList of ApnContext's which would be recursive */

    public String toStringSimple() {

    public synchronized String toStringSimple() {

        return getName() + ": State=" + getCurrentState().getName()

                + " mApnSetting=" + mApnSetting + " RefCount=" + mApnContexts.size()

                + " mCid=" + mCid + " mCreateTime=" + mCreateTime