Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "power_profile: Move all wifi power values" into nyc-dev

Browse Source
This commit is contained in:
Roshan Pius
2016-04-04 22:21:23 +00:00
committed by Android (Google) Code Review
parent 3d48074ed9 2a91e4aabc
commit bf8ea13069
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/os/PowerProfile.java
View File

@@ -85,6 +85,7 @@ public class PowerProfile {
public static final String POWER_WIFI_CONTROLLER_IDLE = "wifi.controller.idle"; public static final String POWER_WIFI_CONTROLLER_IDLE = "wifi.controller.idle";
public static final String POWER_WIFI_CONTROLLER_RX = "wifi.controller.rx"; public static final String POWER_WIFI_CONTROLLER_RX = "wifi.controller.rx";
public static final String POWER_WIFI_CONTROLLER_TX = "wifi.controller.tx"; public static final String POWER_WIFI_CONTROLLER_TX = "wifi.controller.tx";
public static final String POWER_WIFI_CONTROLLER_TX_LEVELS = "wifi.controller.tx_levels";
public static final String POWER_WIFI_CONTROLLER_OPERATING_VOLTAGE = "wifi.controller.voltage"; public static final String POWER_WIFI_CONTROLLER_OPERATING_VOLTAGE = "wifi.controller.voltage";
public static final String POWER_BLUETOOTH_CONTROLLER_IDLE = "bluetooth.controller.idle"; public static final String POWER_BLUETOOTH_CONTROLLER_IDLE = "bluetooth.controller.idle";
@@ -287,9 +288,15 @@ public class PowerProfile {
}; };
for (int i = 0; i < configResIds.length; i++) { for (int i = 0; i < configResIds.length; i++) {
String key = configResIdKeys[i];
// if we already have some of these parameters in power_profile.xml, ignore the
// value in config.xml
if ((sPowerMap.containsKey(key) && (Double) sPowerMap.get(key) > 0)) {
continue;
}
int value = resources.getInteger(configResIds[i]); int value = resources.getInteger(configResIds[i]);
if (value > 0) { if (value > 0) {
sPowerMap.put(configResIdKeys[i], (double) value); sPowerMap.put(key, (double) value);
} }
} }
} }

28
core/res/res/xml/power_profile.xml
View File

@@ -94,11 +94,27 @@
<!-- This is the battery capacity in mAh (measured at nominal voltage) --> <!-- This is the battery capacity in mAh (measured at nominal voltage) -->
<item name="battery.capacity">1000</item> <item name="battery.capacity">1000</item>
<array name="wifi.batchedscan"> <!-- mA --> <!-- Wifi related values. -->
<value>.0002</value> <!-- 1-8/hr --> <!-- Idle Receive current for wifi radio in mA. 0 by default-->
<value>.002</value> <!-- 9-64/hr --> <item name="wifi.controller.idle">0</item>
<value>.02</value> <!-- 65-512/hr --> <!-- Rx current for wifi radio in mA. 0 by default-->
<value>.2</value> <!-- 513-4,096/hr --> <item name="wifi.controller.rx">0</item>
<value>2</value> <!-- 4097-/hr --> <!-- Tx current for wifi radio in mA. 0 by default-->
<item name="wifi.controller.tx">0</item>
<!-- Current at each of the wifi Tx levels in mA. The number of tx levels varies per device
and is available only of wifi chipsets which support the tx level reporting. Use
wifi.tx for other chipsets. none by default -->
<array name="wifi.controller.tx_levels"> <!-- mA -->
</array> </array>
<!-- Operating volatage for wifi radio in mV. 0 by default-->
<item name="wifi.controller.voltage">0</item>
<array name="wifi.batchedscan"> <!-- mA -->
<value>.0002</value> <!-- 1-8/hr -->
<value>.002</value> <!-- 9-64/hr -->
<value>.02</value> <!-- 65-512/hr -->
<value>.2</value> <!-- 513-4,096/hr -->
<value>2</value> <!-- 4097-/hr -->
</array>
</device> </device>