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

Commit 51e36301 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

DataConnection fix race condition due to mApnSetting am: 1b3b4827 

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

Change-Id: Id2a1b65531cb753490e194c26d9249edc816e86e
parents 697753de 1b3b4827

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