Merge "Add NullPtrCheck when smearing in settings" into pi-dev

2018-04-09 17:09:22 +00:00
parent 2df5a0b322 c5f5b18b22
commit c2ec26b4ac
2 changed files with 17 additions and 0 deletions
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -214,6 +214,11 @@ public class BatteryUtils {
        }

        if (totalActivityTimeMs >= 10 * DateUtils.MINUTE_IN_MILLIS) {
+            if (screenSipper == null) {
+                Log.e(TAG, "screen sipper is null even when app screen time is not zero");
+                return;
+            }
+
            final double screenPowerMah = screenSipper.totalPowerMah;
            for (int i = 0, size = sippers.size(); i < size; i++) {
                final BatterySipper sipper = sippers.get(i);