PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 76eed4ec: am 8aea7b4d: Merge "Fixed the NullPointerException" into klp-dev

Browse Source 
* commit '76eed4ecd498c7f9f21dab0df1f51fbf23ffa35c':
  Fixed the NullPointerException
This commit is contained in:
Lifu Tang
2013-09-05 14:55:54 -07:00
committed by Android Git Automerger
parent 4d108e4ff9 76eed4ecd4
commit 641520ab6a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/fuelgauge/BatteryStatsHelper.java
View File

@@ -560,7 +560,7 @@ public class BatteryStatsHelper {
osApp = app; osApp = app;
} }
} }
if (power != 0) { if (power != 0 || includeZeroConsumption) {
if (u.getUid() == Process.WIFI_UID) { if (u.getUid() == Process.WIFI_UID) {
mWifiPower += power; mWifiPower += power;
} else if (u.getUid() == Process.BLUETOOTH_UID) { } else if (u.getUid() == Process.BLUETOOTH_UID) {
@@ -725,7 +725,8 @@ public class BatteryStatsHelper {
name = mActivity.getResources().getString( name = mActivity.getResources().getString(
R.string.running_process_item_removed_user_label); 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); BatterySipper bs = addEntry(name, DrainType.USER, 0, 0, power);
bs.icon = icon; bs.icon = icon;
aggregateSippers(bs, sippers, "User"); aggregateSippers(bs, sippers, "User");