Merge "Synchronize the NetworkStatsFactory constructor." am: f2bd2bbfd8 am: e6193f4086 am: 1bb38318b4

am: 8e0cd114f6 Change-Id: Iee86f191a12207dc203dc0b0a50a74d65decd209
2019-06-27 12:21:04 -07:00
parent 4bbc0d2449 8e0cd114f6
commit ce3cad242c
1 changed files with 4 additions and 2 deletions
--- a/services/core/java/com/android/server/net/NetworkStatsFactory.java
+++ b/services/core/java/com/android/server/net/NetworkStatsFactory.java
@@ -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);