diff options
| author | Mitchell Wills <mwills@google.com> | 2015-08-05 16:59:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-05 16:59:23 +0000 |
| commit | bce3eb22afcd57b7f1bdde26030f8c44bb885a4b (patch) | |
| tree | 9b5d768eaa089dda4bda5e17e0a76b970c013158 | |
| parent | ab868effb7a54bc6a6b2d35412fe466c0adc7f55 (diff) | |
| parent | 083e1d9e4b32dde846b763474152664d62f5b3f1 (diff) | |
| download | frameworks_base-bce3eb22afcd57b7f1bdde26030f8c44bb885a4b.zip frameworks_base-bce3eb22afcd57b7f1bdde26030f8c44bb885a4b.tar.gz frameworks_base-bce3eb22afcd57b7f1bdde26030f8c44bb885a4b.tar.bz2 | |
Merge "Fix incorrect default wifi power draw values" into mnc-dev
| -rw-r--r-- | core/java/com/android/internal/os/WifiPowerCalculator.java | 5 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/WifiPowerEstimator.java | 7 | ||||
| -rwxr-xr-x | core/res/res/values/config.xml | 8 |
3 files changed, 16 insertions, 4 deletions
diff --git a/core/java/com/android/internal/os/WifiPowerCalculator.java b/core/java/com/android/internal/os/WifiPowerCalculator.java index da98a67..146c0f8 100644 --- a/core/java/com/android/internal/os/WifiPowerCalculator.java +++ b/core/java/com/android/internal/os/WifiPowerCalculator.java @@ -57,6 +57,11 @@ public class WifiPowerCalculator extends PowerCalculator { statsType); app.wifiTxBytes = u.getNetworkActivityBytes(BatteryStats.NETWORK_WIFI_TX_DATA, statsType); + + if (DEBUG && app.wifiPowerMah != 0) { + Log.d(TAG, "UID " + u.getUid() + ": idle=" + idleTime + "ms rx=" + rxTime + "ms tx=" + + txTime + "ms power=" + BatteryStatsHelper.makemAh(app.wifiPowerMah)); + } } @Override diff --git a/core/java/com/android/internal/os/WifiPowerEstimator.java b/core/java/com/android/internal/os/WifiPowerEstimator.java index c4e2ef6..3bd79f7 100644 --- a/core/java/com/android/internal/os/WifiPowerEstimator.java +++ b/core/java/com/android/internal/os/WifiPowerEstimator.java @@ -16,11 +16,14 @@ package com.android.internal.os; import android.os.BatteryStats; +import android.util.Log; /** * Estimates WiFi power usage based on timers in BatteryStats. */ public class WifiPowerEstimator extends PowerCalculator { + private static final boolean DEBUG = BatteryStatsHelper.DEBUG; + private static final String TAG = "WifiPowerEstimator"; private final double mWifiPowerPerPacket; private final double mWifiPowerOn; private final double mWifiPowerScan; @@ -75,6 +78,10 @@ public class WifiPowerEstimator extends PowerCalculator { } app.wifiPowerMah = wifiPacketPower + wifiLockPower + wifiScanPower + wifiBatchScanPower; + if (DEBUG && app.wifiPowerMah != 0) { + Log.d(TAG, "UID " + u.getUid() + ": power=" + + BatteryStatsHelper.makemAh(app.wifiPowerMah)); + } } @Override diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index b1bde0e..cf28490 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -501,16 +501,16 @@ <bool translatable="false" name="config_wifi_ssid_white_list_enable">true</bool> <!-- Idle Receive current for wifi radio. 0 by default--> - <integer translatable="false" name="config_wifi_idle_receive_cur_ma">1</integer> + <integer translatable="false" name="config_wifi_idle_receive_cur_ma">0</integer> <!-- Rx current for wifi radio. 0 by default--> - <integer translatable="false" name="config_wifi_active_rx_cur_ma">2</integer> + <integer translatable="false" name="config_wifi_active_rx_cur_ma">0</integer> <!-- Tx current for wifi radio. 0 by default--> - <integer translatable="false" name="config_wifi_tx_cur_ma">3</integer> + <integer translatable="false" name="config_wifi_tx_cur_ma">0</integer> <!-- Operating volatage for wifi radio. 0 by default--> - <integer translatable="false" name="config_wifi_operating_voltage_mv">4</integer> + <integer translatable="false" name="config_wifi_operating_voltage_mv">0</integer> <!-- Flag indicating whether the we should enable the automatic brightness in Settings. Software implementation will be used if config_hardware_auto_brightness_available is not set --> |