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

Commit a02a70f3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixed data activity not updated" into udc-dev am: d2cbc033 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/22083606



Change-Id: Idaf228f068a838fd96cdda7660311694a8c61ae0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d8a90d3d d2cbc033

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