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

Commit 5af0f26c authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by Automerger Merge Worker
Browse files

Merge "Use Phone.getState() to check for active call to skip data stall... 

Merge "Use Phone.getState() to check for active call to skip data stall recovery" into rvc-d1-dev am: d9e05bde am: 6ac11dac

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

Change-Id: Iff0b51fadc82705c34e1f5c90223ca287db57dc0
parents 61c602a6 6ac11dac

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

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



            // Skip recovery if it can cause a call to drop

            if (mInVoiceCall && getRecoveryAction() > RECOVERY_ACTION_CLEANUP) {

            if (mPhone.getState() != PhoneConstants.State.IDLE

                    && getRecoveryAction() > RECOVERY_ACTION_CLEANUP) {

                if (VDBG_STALL) log("skip data stall recovery as there is an active call");

                return false;

            }

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

+2 −0
Original line number Diff line number Diff line
@@ -1642,6 +1642,7 @@ public class DcTrackerTest extends TelephonyTest { 
                Settings.Global.MIN_DURATION_BETWEEN_RECOVERY_STEPS_IN_MS, 100);

        Settings.System.putInt(resolver, "radio.data.stall.recovery.action", 2);

        doReturn(new SignalStrength()).when(mPhone).getSignalStrength();

        doReturn(PhoneConstants.State.IDLE).when(mPhone).getState();



        mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,

                new String[]{PhoneConstants.APN_TYPE_DEFAULT, PhoneConstants.APN_TYPE_MMS});
@@ -1674,6 +1675,7 @@ public class DcTrackerTest extends TelephonyTest { 
                Settings.Global.MIN_DURATION_BETWEEN_RECOVERY_STEPS_IN_MS, 100);

        Settings.System.putInt(resolver, "radio.data.stall.recovery.action", 3);

        doReturn(new SignalStrength()).when(mPhone).getSignalStrength();

        doReturn(PhoneConstants.State.IDLE).when(mPhone).getState();



        mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,

                new String[]{PhoneConstants.APN_TYPE_DEFAULT, PhoneConstants.APN_TYPE_MMS});