From 1a2b39e61cd52e21b7e51391fa79d400076085ac Mon Sep 17 00:00:00 2001
From: Adam Lesinski <adamlesinski@google.com>
Date: Fri, 29 Apr 2016 17:56:58 -0700
Subject: [PATCH] BatteryStats: Reset per-User Bluetooth and Modem controller
 activity

Bug:28469956
Change-Id: I4db68ecc5b7bde8dd552caadee489b7bad3d6cbc
---
 core/java/com/android/internal/os/BatteryStatsImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 5358d78e1b02a..c015cd8514896 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -5611,12 +5611,12 @@ public class BatteryStatsImpl extends BatteryStats {
                 mWifiControllerActivity.reset(false);
             }
 
-            if (mBsi.mBluetoothActivity != null) {
-                mBsi.mBluetoothActivity.reset(false);
+            if (mBluetoothControllerActivity != null) {
+                mBluetoothControllerActivity.reset(false);
             }
 
-            if (mBsi.mModemActivity != null) {
-                mBsi.mModemActivity.reset(false);
+            if (mModemControllerActivity != null) {
+                mModemControllerActivity.reset(false);
             }
 
             mUserCpuTime.reset(false);