From 6cc61f17a1b239217225347d52fbef43fc72066c Mon Sep 17 00:00:00 2001
From: Lifu Tang <lifu@google.com>
Date: Thu, 5 Sep 2013 13:52:55 -0700
Subject: Fixed the NullPointerException

- Fix b/10633295

Change-Id: Ia429e679c53c959351316ffda7619e10ad6a626c
---
 src/com/android/settings/fuelgauge/BatteryStatsHelper.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/com/android/settings/fuelgauge/BatteryStatsHelper.java b/src/com/android/settings/fuelgauge/BatteryStatsHelper.java
index 953ff3d..71c69a3 100644
--- a/src/com/android/settings/fuelgauge/BatteryStatsHelper.java
+++ b/src/com/android/settings/fuelgauge/BatteryStatsHelper.java
@@ -560,7 +560,7 @@ public class BatteryStatsHelper {
                     osApp = app;
                 }
             }
-            if (power != 0) {
+            if (power != 0 || includeZeroConsumption) {
                 if (u.getUid() == Process.WIFI_UID) {
                     mWifiPower += power;
                 } else if (u.getUid() == Process.BLUETOOTH_UID) {
@@ -725,7 +725,8 @@ public class BatteryStatsHelper {
                 name = mActivity.getResources().getString(
                         R.string.running_process_item_removed_user_label);
             }
-            double power = mUserPower.get(userId);
+            Double userPower = mUserPower.get(userId);
+            double power = (userPower != null) ? userPower : 0.0;
             BatterySipper bs = addEntry(name, DrainType.USER, 0, 0, power);
             bs.icon = icon;
             aggregateSippers(bs, sippers, "User");
-- 
cgit v1.1