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

Commit 0352841d authored by Amit Mahajan's avatar Amit Mahajan Committed by Automerger Merge Worker
Browse files

Merge "Dont reuse DcController object after calling dispose() on it." am: e107b6a0 

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

Change-Id: Idcc2923929a06c5ce3c8d0bd756626d603257a88
parents cf08dd92 e107b6a0

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

+14 −6
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ public class DcTracker extends Handler { 
            "extra_handover_failure_fallback";



    private final String mLogTag;

    private final String mLogTagSuffix;



    public AtomicBoolean isCleanupRequired = new AtomicBoolean(false);
@@ -671,13 +672,12 @@ public class DcTracker extends Handler { 
                .createForSubscriptionId(phone.getSubId());

        // The 'C' in tag indicates cellular, and 'I' indicates IWLAN. This is to distinguish

        // between two DcTrackers, one for each.

        String tagSuffix = "-" + ((transportType == AccessNetworkConstants.TRANSPORT_TYPE_WWAN)

                ? "C" : "I");

        tagSuffix += "-" + mPhone.getPhoneId();

        mLogTag = "DCT" + tagSuffix;

        mLogTagSuffix = "-" + ((transportType == AccessNetworkConstants.TRANSPORT_TYPE_WWAN)

                ? "C" : "I") + "-" + mPhone.getPhoneId();

        mLogTag = "DCT" + mLogTagSuffix;



        mTransportType = transportType;

        mDataServiceManager = new DataServiceManager(phone, transportType, tagSuffix);

        mDataServiceManager = new DataServiceManager(phone, transportType, mLogTagSuffix);



        mResolver = mPhone.getContext().getContentResolver();

        mAlarmManager =
@@ -713,7 +713,7 @@ public class DcTracker extends Handler { 
        mHandlerThread = new HandlerThread("DcHandlerThread");

        mHandlerThread.start();

        Handler dcHandler = new Handler(mHandlerThread.getLooper());

        mDcc = DcController.makeDcc(mPhone, this, mDataServiceManager, dcHandler, tagSuffix);

        mDcc = DcController.makeDcc(mPhone, this, mDataServiceManager, dcHandler, mLogTagSuffix);

        mDcTesterFailBringUpAll = new DcTesterFailBringUpAll(mPhone, dcHandler);



        mDataConnectionTracker = this;
@@ -736,6 +736,7 @@ public class DcTracker extends Handler { 
    @VisibleForTesting

    public DcTracker() {

        mLogTag = "DCT";

        mLogTagSuffix = null;

        mTelephonyManager = null;

        mAlarmManager = null;

        mPhone = null;
@@ -5032,9 +5033,16 @@ public class DcTracker extends Handler { 


    private void onDataServiceBindingChanged(boolean bound) {

        if (bound) {

            if (mDcc == null) {

                mDcc = DcController.makeDcc(mPhone, this, mDataServiceManager,

                        new Handler(mHandlerThread.getLooper()), mLogTagSuffix);

            }

            mDcc.start();

        } else {

            mDcc.dispose();

            // dispose sets the associated Handler object (StateMachine#mSmHandler) to null, so mDcc

            // needs to be created again (simply calling start() on it after dispose will not work)

            mDcc = null;

        }

        mDataServiceBound = bound;

    }