Merge "Fix the race condition for b/11458382" (a5043fb4) · Commits · e / os / android_frameworks_base

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -464,22 +464,22 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
		private NetworkStatsCollection mUidTagComplete;

		private NetworkStatsCollection getUidComplete() {
		if (mUidComplete == null) {
		synchronized (mStatsLock) {
		if (mUidComplete == null) {
		mUidComplete = mUidRecorder.getOrLoadCompleteLocked();
		}
		}
		return mUidComplete;
		}
		}

		private NetworkStatsCollection getUidTagComplete() {
		if (mUidTagComplete == null) {
		synchronized (mStatsLock) {
		if (mUidTagComplete == null) {
		mUidTagComplete = mUidTagRecorder.getOrLoadCompleteLocked();
		}
		}
		return mUidTagComplete;
		}
		}

		@Override
		public NetworkStats getSummaryForNetwork(