am 38d3353e: am 03e90322: Merge "Remove more entries not relevant to wifi-only devices." into honeycomb

* commit '38d3353e37be450b1b95d2525acbd53e9b67130e':
  Remove more entries not relevant to wifi-only devices.
This commit is contained in:
Amith Yamasani
2011-03-02 12:53:31 -08:00
committed by Android Git Automerger
8 changed files with 163 additions and 73 deletions

View File

@@ -684,7 +684,10 @@ public class PowerUsageSummary extends PreferenceFragment implements Runnable {
addWiFiUsage(uSecNow);
addBluetoothUsage(uSecNow);
addIdleUsage(uSecNow); // Not including cellular idle power
addRadioUsage(uSecNow);
// Don't compute radio usage if it's a wifi-only device
if (!com.android.settings.Utils.isWifiOnly()) {
addRadioUsage(uSecNow);
}
}
private BatterySipper addEntry(String label, DrainType drainType, long time, int iconId,