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

Commit 2bcbc350 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Synchronize the NetworkStatsFactory constructor. 

This ensures the constructor takes the necessary lock before
accessing memmber variables.

Bug: 113122541
Test: atest FrameworksNetTests
Change-Id: Ibd324ed922c738b8d77d4eb74f45b75c6645bdc7
parent 08b928e8

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