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

Commit 1078247c authored by Jack Yu's avatar Jack Yu
Browse files

Fixed data activity not updated 

We should always update data activity when there
is a change.

Fix: 273620126
Test: atest LinkBandwidthEstimatorTest#testDataActivity
Change-Id: I96b6e93bb20adb470250887cd175bbfce14ac032
parent 7b74471c

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) {