commit 8f6df28f5044e9e94e04e82acfd02aa33079fb23
author Junyu Lai <junyulai@google.com> Fri Oct 20 06:06:37 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 20 06:06:37 2023 +0000
tree eb2f641bfe211779e45267760b826ed6c323986c
parent 26af70f5fe9cc5c51bb2dcd3ee6c930d335279b5
parent 6d0bdd197acb7c85be6af6d3fbede6aed392791e

Merge "Add synchronized block when accessing global variables" into main

service-t/src/com/android/server/net/NetworkStatsService.java

diff --git a/service-t/src/com/android/server/net/NetworkStatsService.java b/service-t/src/com/android/server/net/NetworkStatsService.java
index 25e59d5..cc67550 100644
--- a/service-t/src/com/android/server/net/NetworkStatsService.java
+++ b/service-t/src/com/android/server/net/NetworkStatsService.java
@@ -517,11 +517,12 @@
                     break;
                 }
                 case MSG_NOTIFY_NETWORK_STATUS: {
-                    // If no cached states, ignore.
-                    if (mLastNetworkStateSnapshots == null) break;
-                    // TODO (b/181642673): Protect mDefaultNetworks from concurrent accessing.
-                    handleNotifyNetworkStatus(
-                            mDefaultNetworks, mLastNetworkStateSnapshots, mActiveIface);
+                    synchronized (mStatsLock) {
+                        // If no cached states, ignore.
+                        if (mLastNetworkStateSnapshots == null) break;
+                        handleNotifyNetworkStatus(
+                                mDefaultNetworks, mLastNetworkStateSnapshots, mActiveIface);
+                    }
                     break;
                 }
                 case MSG_PERFORM_POLL_REGISTER_ALERT: {