Update power usage UI to follow WIFI data changes.

Now handles WIFI start times being distributed across applications,
and collapses all work done in WIFI uid procs (esp that supplicant
thing) into the apps and overall WIFI category.

Change-Id: I341e5d63c45eeb0fb4121beed62474d947f9de11

1 files changed, 11 insertions, 9 deletions

diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index acd9ee4..fd36a9d 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -563,15 +563,17 @@ public class BatteryHistoryChart extends View {
                     }
                 }
                 
-            } else if (curLevelPath != null) {
-                finishPaths(x+1, h, levelh, startX, lastY, curLevelPath, lastX,
-                        lastCharging, lastScreenOn, lastGpsOn, lastWifiRunning,
-                        lastWakeLock, lastPhoneSignalBin, lastLinePath);
-                lastX = lastY = -1;
-                curLevelPath = null;
-                lastLinePath = null;
-                lastCharging = lastScreenOn = lastGpsOn = lastWakeLock = false;
-                lastPhoneSignalBin = 0;
+            } else if (rec.cmd != BatteryStats.HistoryItem.CMD_OVERFLOW) {
+                if (curLevelPath != null) {
+                    finishPaths(x+1, h, levelh, startX, lastY, curLevelPath, lastX,
+                            lastCharging, lastScreenOn, lastGpsOn, lastWifiRunning,
+                            lastWakeLock, lastPhoneSignalBin, lastLinePath);
+                    lastX = lastY = -1;
+                    curLevelPath = null;
+                    lastLinePath = null;
+                    lastCharging = lastScreenOn = lastGpsOn = lastWakeLock = false;
+                    lastPhoneSignalBin = 0;
+                }
             }
             
             rec = rec.next;