Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8aea7b4d authored by Lifu Tang's avatar Lifu Tang Committed by Android (Google) Code Review
Browse files

Merge "Fixed the NullPointerException" into klp-dev

parents 10cbbc55 6cc61f17

src/com/android/settings/fuelgauge/BatteryStatsHelper.java

+3 −2
Original line number Diff line number Diff line
@@ -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");