Merge "Fixed data activity not updated" into udc-dev (d2cbc033) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/data/LinkBandwidthEstimator.java

+17 −17

Original line number	Diff line number	Diff line
		@@ -458,6 +458,23 @@ public class LinkBandwidthEstimator extends Handler {
		long txBytesDelta = mobileTxBytes - mLastMobileTxBytes;
		long rxBytesDelta = mobileRxBytes - mLastMobileRxBytes;

		int dataActivity;
		if (txBytesDelta > 0 && rxBytesDelta > 0) {
		dataActivity = TelephonyManager.DATA_ACTIVITY_INOUT;
		} else if (rxBytesDelta > 0) {
		dataActivity = TelephonyManager.DATA_ACTIVITY_IN;
		} else if (txBytesDelta > 0) {
		dataActivity = TelephonyManager.DATA_ACTIVITY_OUT;
		} else {
		dataActivity = TelephonyManager.DATA_ACTIVITY_NONE;
		}

		if (mDataActivity != dataActivity) {
		mDataActivity = dataActivity;
		mLinkBandwidthEstimatorCallbacks.forEach(callback -> callback.invokeFromExecutor(
		() -> callback.onDataActivityChanged(dataActivity)));
		}

		// Schedule the next traffic stats poll
		sendEmptyMessageDelayed(MSG_TRAFFIC_STATS_POLL, TRAFFIC_STATS_POLL_INTERVAL_MS);

		@@ -506,23 +523,6 @@ public class LinkBandwidthEstimator extends Handler {
		return;
		}

		int dataActivity;
		if (txBytesDelta > 0 && rxBytesDelta > 0) {
		dataActivity = TelephonyManager.DATA_ACTIVITY_INOUT;
		} else if (rxBytesDelta > 0) {
		dataActivity = TelephonyManager.DATA_ACTIVITY_IN;
		} else if (txBytesDelta > 0) {
		dataActivity = TelephonyManager.DATA_ACTIVITY_OUT;
		} else {
		dataActivity = TelephonyManager.DATA_ACTIVITY_NONE;
		}

		if (mDataActivity != dataActivity) {
		mDataActivity = dataActivity;
		mLinkBandwidthEstimatorCallbacks.forEach(callback -> callback.invokeFromExecutor(
		() -> callback.onDataActivityChanged(dataActivity)));
		}

		long timeSinceLastFilterUpdateMs = currTimeMs - mFilterUpdateTimeMs;
		// Update filter
		if (timeSinceLastFilterUpdateMs >= FILTER_UPDATE_MAX_INTERVAL_MS) {