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

Commit 5bfa752f authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Avoid clobbering UID stats when not yet loaded."

parents 395eef3b af833937

services/java/com/android/server/net/NetworkStatsService.java

+6 −2
Original line number Diff line number Diff line
@@ -225,7 +225,9 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
        mContext.unregisterReceiver(mShutdownReceiver);



        writeNetworkStatsLocked();

        if (mUidStatsLoaded) {

            writeUidStatsLocked();

        }

        mNetworkStats.clear();

        mUidStats.clear();

        mUidStatsLoaded = false;
@@ -442,7 +444,9 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
            if (persistDelta.rx[index] > persistThreshold

                    || persistDelta.tx[index] > persistThreshold) {

                writeNetworkStatsLocked();

                if (mUidStatsLoaded) {

                    writeUidStatsLocked();

                }

                mLastNetworkPersist = networkStats;

                break;

            }