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

Commit 129287a7 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Synchronize the NetworkStatsFactory constructor." am: f2bd2bbf am:... 

Merge "Synchronize the NetworkStatsFactory constructor." am: f2bd2bbf am: e6193f40 am: 1326d6cf
am: 4d6f1fce

Change-Id: Iee86f191a12207dc203dc0b0a50a74d65decd209
parents e89ba7f1 4d6f1fce

services/core/java/com/android/server/net/NetworkStatsFactory.java

+4 −2
Original line number Diff line number Diff line
@@ -179,9 +179,11 @@ public class NetworkStatsFactory { 
        mStatsXtIfaceFmt = new File(procRoot, "net/xt_qtaguid/iface_stat_fmt");

        mStatsXtUid = new File(procRoot, "net/xt_qtaguid/stats");

        mUseBpfStats = useBpfStats;

        synchronized (sPersistentDataLock) {

            mPersistSnapshot = new NetworkStats(SystemClock.elapsedRealtime(), -1);

            mTunAnd464xlatAdjustedStats = new NetworkStats(SystemClock.elapsedRealtime(), -1);

        }

    }



    public NetworkStats readBpfNetworkStatsDev() throws IOException {

        final NetworkStats stats = new NetworkStats(SystemClock.elapsedRealtime(), 6);