Merge "Fix 2 instances of buggy double check locking on non-volatile fields."

2016-05-19 05:19:28 +00:00
parent e68d6ff96b 92a0487493
commit ae82b979bb
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/net/NetworkStatsObservers.java
+++ b/services/core/java/com/android/server/net/NetworkStatsObservers.java
@@ -68,7 +68,7 @@ class NetworkStatsObservers {
    private final AtomicInteger mNextDataUsageRequestId = new AtomicInteger();

    // Lazily instantiated when an observer is registered.
-    private Handler mHandler;
+    private volatile Handler mHandler;

    /**
     * Creates a wrapper that contains the caller context and a normalized request.