commit 96debb5c96e8b75945ea2c2e1171cf29fe2c2887
author Dianne Hackborn <hackbod@google.com> Fri Jun 20 14:46:55 2014 -0700
committer Dianne Hackborn <hackbod@google.com> Fri Jun 20 16:02:12 2014 -0700
tree dfc6e377351834afea8ddcd469feab67b42ac16c
parent c24ffca0f43ec73c112613750960438fcd846fb2

Update to follow battery stats change.

Improve how we decide that WIFI is on.

Change-Id: If209d85dd88b6bdd56913684a890f732b8234a8c

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

diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index b030884..daff7ea 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -545,6 +545,7 @@
         long lastWallTime = 0;
         long lastRealtime = 0;
         int aggrStates = 0;
+        int aggrStates2 = 0;
         boolean first = true;
         if (stats.startIteratingHistoryLocked()) {
             final HistoryItem rec = new HistoryItem();
@@ -569,6 +570,7 @@
                     lastInteresting = pos;
                     mHistDataEnd = rec.time;
                     aggrStates |= rec.states;
+                    aggrStates2 |= rec.states2;
                 }
             }
         }
@@ -577,7 +579,10 @@
         mEndWallTime = mEndDataWallTime + (remainingTimeUs/1000);
         mNumHist = lastInteresting;
         mHaveGps = (aggrStates&HistoryItem.STATE_GPS_ON_FLAG) != 0;
-        mHaveWifi = (aggrStates&HistoryItem.STATE_WIFI_RUNNING_FLAG) != 0;
+        mHaveWifi = (aggrStates2&HistoryItem.STATE2_WIFI_RUNNING_FLAG) != 0
+                || (aggrStates&(HistoryItem.STATE_WIFI_FULL_LOCK_FLAG
+                        |HistoryItem.STATE_WIFI_MULTICAST_ON_FLAG
+                        |HistoryItem.STATE_WIFI_SCAN_FLAG)) != 0;
         if (!com.android.settings.Utils.isWifiOnly(getContext())) {
             mHavePhoneSignal = true;
         }
@@ -774,7 +779,8 @@
         Path curLevelPath = null;
         Path lastLinePath = null;
         boolean lastCharging = false, lastScreenOn = false, lastGpsOn = false;
-        boolean lastWifiRunning = false, lastCpuRunning = false;
+        boolean lastWifiRunning = false, lastWifiSupplRunning = false, lastCpuRunning = false;
+        int lastWifiSupplState = BatteryStats.WIFI_SUPPL_STATE_INVALID;
         final int N = mNumHist;
         if (mStats.startIteratingHistoryLocked()) {
             final HistoryItem rec = new HistoryItem();
@@ -868,8 +874,33 @@
                             lastGpsOn = gpsOn;
                         }
 
-                        final boolean wifiRunning =
-                            (rec.states&HistoryItem.STATE_WIFI_RUNNING_FLAG) != 0;
+                        final int wifiSupplState =
+                            ((rec.states2&HistoryItem.STATE2_WIFI_SUPPL_STATE_MASK)
+                                    >> HistoryItem.STATE2_WIFI_SUPPL_STATE_SHIFT);
+                        boolean wifiRunning;
+                        if (lastWifiSupplState != wifiSupplState) {
+                            lastWifiSupplState = wifiSupplState;
+                            switch (wifiSupplState) {
+                                case BatteryStats.WIFI_SUPPL_STATE_DISCONNECTED:
+                                case BatteryStats.WIFI_SUPPL_STATE_DORMANT:
+                                case BatteryStats.WIFI_SUPPL_STATE_INACTIVE:
+                                case BatteryStats.WIFI_SUPPL_STATE_INTERFACE_DISABLED:
+                                case BatteryStats.WIFI_SUPPL_STATE_INVALID:
+                                case BatteryStats.WIFI_SUPPL_STATE_UNINITIALIZED:
+                                    wifiRunning = lastWifiSupplRunning = false;
+                                    break;
+                                default:
+                                    wifiRunning = lastWifiSupplRunning = true;
+                                    break;
+                            }
+                        } else {
+                            wifiRunning = lastWifiSupplRunning;
+                        }
+                        if ((rec.states&(HistoryItem.STATE_WIFI_FULL_LOCK_FLAG
+                                |HistoryItem.STATE_WIFI_MULTICAST_ON_FLAG
+                                |HistoryItem.STATE_WIFI_SCAN_FLAG)) != 0) {
+                            wifiRunning = true;
+                        }
                         if (wifiRunning != lastWifiRunning) {
                             if (wifiRunning) {
                                 mWifiRunningPath.moveTo(x, h-mWifiRunningOffset);
@@ -899,8 +930,8 @@
                             } else if ((rec.states&HistoryItem.STATE_PHONE_SCANNING_FLAG) != 0) {
                                 bin = 1;
                             } else {
-                                bin = (rec.states&HistoryItem.STATE_SIGNAL_STRENGTH_MASK)
-                                        >> HistoryItem.STATE_SIGNAL_STRENGTH_SHIFT;
+                                bin = (rec.states&HistoryItem.STATE_PHONE_SIGNAL_STRENGTH_MASK)
+                                        >> HistoryItem.STATE_PHONE_SIGNAL_STRENGTH_SHIFT;
                                 bin += 2;
                             }
                             mPhoneSignalChart.addTick(x, bin);