DcTracker: Expedite data stall recovery

The current stall recovery process has a pending packet queue which
needs to fill up before a stall is determined. But that process is
also multi-step, and it is currently expecting that queue to fill
between steps.
Waiting for the unacknowledged packets to grow after running the
connection cleanup step looks like something that would never happen,
or would take a very long time to, so expedite the stall recovery after
it begins: if any single packet stalls and there's already a recovery
in progress, run the follow up step immediately.

Change-Id: Ib16b2c47b5c832a812c8bd2a3d940862741ed9db

1 files changed, 2 insertions, 1 deletions

diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java b/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
index 029044c88..4217db988 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
@@ -1668,7 +1668,8 @@ public abstract class DcTrackerBase extends Handler {
                 NUMBER_SENT_PACKETS_OF_HANG);
 
         boolean suspectedStall = DATA_STALL_NOT_SUSPECTED;
-        if (mSentSinceLastRecv >= hangWatchdogTrigger) {
+        if (mSentSinceLastRecv >= hangWatchdogTrigger ||
+            (mSentSinceLastRecv > 0 && getRecoveryAction() != RecoveryAction.GET_DATA_CALL_LIST) ) {
             if (DBG) {
                 log("onDataStallAlarm: tag=" + tag + " do recovery action=" + getRecoveryAction());
             }