From 4509b940fb7b9e7b013ea1d0d64621a683f92f7b Mon Sep 17 00:00:00 2001
From: Ian Rogers <irogers@google.com>
Date: Wed, 18 May 2016 19:58:56 -0700
Subject: [PATCH] Fix 2 instances of buggy double check locking on non-volatile
 fields.

Bug caught by Error Prone:
http://errorprone.info/bugpattern/DoubleCheckedLocking

Bug: 27723540
Change-Id: I0b0c06ce4ae1ffb668e8ab3a7fe07706df173f18
---
 .../src/com/android/systemui/recents/events/EventBus.java       | 2 +-
 .../core/java/com/android/server/net/NetworkStatsObservers.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/EventBus.java b/packages/SystemUI/src/com/android/systemui/recents/events/EventBus.java
index 38ad1c7107167..a7375051e3385 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/events/EventBus.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/events/EventBus.java
@@ -378,7 +378,7 @@ public class EventBus extends BroadcastReceiver {
 
     // Used for initializing the default bus
     private static final Object sLock = new Object();
-    private static EventBus sDefaultBus;
+    private static volatile EventBus sDefaultBus;
 
     // The handler to post all events
     private Handler mHandler;
diff --git a/services/core/java/com/android/server/net/NetworkStatsObservers.java b/services/core/java/com/android/server/net/NetworkStatsObservers.java
index 6f781b3ebb6f0..77292846bedf2 100644
--- 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.