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

Commit d9e05bde authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by Android (Google) Code Review
Browse files

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

parents ef625631 6371f345

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

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

            }





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

            // 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");

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

                return false;

                return false;

            }

            }

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

+2 −0
Original line number Original line 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.Global.MIN_DURATION_BETWEEN_RECOVERY_STEPS_IN_MS, 100);

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

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

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

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

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





        mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,

        mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,

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

                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.Global.MIN_DURATION_BETWEEN_RECOVERY_STEPS_IN_MS, 100);

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

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

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

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

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





        mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,

        mBundle.putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,

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

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