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

Commit 4408f95e authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Handover retry checks for DATA_IS_DISCONNECTING" am: 6d1016af 

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

Change-Id: I8ddcbd3abf13b20be0ab38ac1fbcf33a5e6710db
parents 12b49be4 6d1016af

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

+1 −2
Original line number Diff line number Diff line
@@ -1593,8 +1593,7 @@ public class DcTracker extends Handler { 
            }



            // Check if it fails because of the existing data is still disconnecting.

            if (dataConnectionReasons.containsOnly(

                    DataDisallowedReasonType.DATA_IS_DISCONNECTING)

            if (dataConnectionReasons.contains(DataDisallowedReasonType.DATA_IS_DISCONNECTING)

                    && isHandoverPending(apnContext.getApnTypeBitmask())) {

                // Normally we don't retry when isDataAllow() returns false, because that's consider

                // pre-condition not met, for example, data not enabled by the user, or airplane

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -2829,6 +2829,7 @@ public class DcTrackerTest extends TelephonyTest { 
        doReturn(mApnContext).when(apnContextsByType).get(eq(ApnSetting.TYPE_IMS));

        doReturn(mApnContext).when(apnContexts).get(eq(ApnSetting.TYPE_IMS_STRING));

        doReturn(false).when(mApnContext).isConnectable();

        doReturn(false).when(mDataEnabledSettings).isDataEnabled(anyInt());

        doReturn(DctConstants.State.DISCONNECTING).when(mApnContext).getState();

        replaceInstance(DcTracker.class, "mApnContextsByType", mDct, apnContextsByType);

        replaceInstance(DcTracker.class, "mApnContexts", mDct, apnContexts);
@@ -2850,6 +2851,7 @@ public class DcTrackerTest extends TelephonyTest { 
        doReturn(DctConstants.State.RETRYING).when(mApnContext).getState();

        // Data now is disconnected

        doReturn(true).when(mApnContext).isConnectable();

        doReturn(true).when(mDataEnabledSettings).isDataEnabled(anyInt());

        mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_DISCONNECT_DONE,

                new AsyncResult(Pair.create(mApnContext, 0), null, null)));