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

Commit 647ed5a4 authored by Sarah Chin's avatar Sarah Chin Committed by Android (Google) Code Review
Browse files

Merge "DataConnection fix race condition due to mApnSetting" into sc-dev

parents 92694894 eb6f5ab9

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

+2 −2
Original line number Diff line number Diff line
@@ -1324,7 +1324,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;
@@ -3830,7 +3830,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