diff --git a/service-t/src/com/android/server/net/NetworkStatsService.java b/service-t/src/com/android/server/net/NetworkStatsService.java index 25e59d53cd6d49ba4dd8b65e7bbcc102f792eca9..cc675501be01b35e7822f454c07eff12f47e0467 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 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 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: {