Merge "Skip data stall recovery during voice call" am: 317d9af0a1 (2f4a94e4) · Commits · e / os / android_frameworks_opt_telephony

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

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4758,11 +4758,20 @@ public class DcTracker extends Handler {
	return false;		return false;
	}		}

			// Skip recovery if it can cause a call to drop
			if (mInVoiceCall && getRecoveryAction() > RECOVERY_ACTION_CLEANUP) {
			if (VDBG_STALL) log("skip data stall recovery as there is an active call");
			return false;
			}

	// Allow recovery if data is expected to work		// Allow recovery if data is expected to work
	return mAttached.get() && isDataAllowed(null);		return mAttached.get() && isDataAllowed(null);
	}		}

	private void triggerRecovery() {		private void triggerRecovery() {
			// Updating the recovery start time early to avoid race when
			// the message is being processed in the Queue
			mTimeLastRecoveryStartMs = SystemClock.elapsedRealtime();
	sendMessage(obtainMessage(DctConstants.EVENT_DO_RECOVERY));		sendMessage(obtainMessage(DctConstants.EVENT_DO_RECOVERY));
	}		}

	@@ -4812,7 +4821,6 @@ public class DcTracker extends Handler {
	+ recoveryAction);		+ recoveryAction);
	}		}
	mSentSinceLastRecv = 0;		mSentSinceLastRecv = 0;
	mTimeLastRecoveryStartMs = SystemClock.elapsedRealtime();
	}		}
	}		}