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

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;

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.