Test of new power profile values.

Change-Id: I54719b9838f8f355cd5192a0bc4082fb8c3e35db
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 74a0c8a..e3e0ef4 100755
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -1,45 +1,48 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-**

-** Copyright 2015, The Android Open Source Project

-**

-** Licensed under the Apache License, Version 2.0 (the "License")

-** you may not use this file except in compliance with the License.

-** You may obtain a copy of the License at

-**

-**     http://www.apache.org/licenses/LICENSE-2.0

-**

-** Unless required by applicable law or agreed to in writing, software

-** distributed under the License is distributed on an "AS IS" BASIS,

-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-** See the License for the specific language governing permissions and

-** limitations under the License.

-*/

--->

-<device name="Android">

-    <!-- All values are in mAh except as noted -->

-    <item name="none">0</item>

-    <item name="screen.on">79.5</item>

-    <item name="screen.full">205.0</item>

-    <item name="bluetooth.active">25.2</item>

-    <item name="bluetooth.on">1.7</item>

-    <item name="wifi.on">2.7</item>

-    <item name="wifi.active">82.0</item>

-    <item name="wifi.scan">60.6</item>

-    <item name="dsp.audio">26.5</item>

-    <item name="dsp.video">242.0</item>

-    <item name="gps.on">35.33</item>

-    <item name="radio.active">183.1</item>

-    <!-- The current consumed by the radio when it is scanning for a signal -->

-    <item name="radio.scanning">77.0</item>

-    <!-- Current consumed by the radio at different signal strengths, when paging -->

-    <array name="radio.on"> <!-- Strength 0 to BINS-1 -->

-        <value>1.41</value>

-        <value>1.41</value>

-    </array>

-

-    <!-- Different CPU speeds as reported in

-         /sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state -->

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2015, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License")
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<device name="Android">
+    <!-- All values are in mAh except as noted -->
+    <item name="none">0</item>
+    <item name="screen.on">169.4278765</item>
+    <item name="screen.full">79.09344216</item>
+    <item name="bluetooth.active">25.2</item>
+    <item name="bluetooth.on">1.7</item>
+    <item name="wifi.on">21.21733311</item>
+    <item name="wifi.active">98.04989804</item>
+    <item name="wifi.scan">129.8951166</item>
+    <item name="dsp.audio">26.5</item>
+    <item name="dsp.video">242.0</item>
+    <item name="gps.on">5.661105191</item>
+    <item name="radio.active">64.8918361</item>
+    <!-- The current consumed by the radio when it is scanning for a signal -->
+    <item name="radio.scanning">19.13559783</item>
+    <!-- Current consumed by the radio at different signal strengths, when paging -->
+    <array name="radio.on"> <!-- Strength 0 to BINS-1 -->
+        <value>17.52231575</value>
+        <value>5.902211798</value>
+	<value>6.454893079</value>
+	<value>6.771166916</value>
+	<value>6.725541238</value>
+    </array>
+
+    <!-- Different CPU speeds as reported in
+         /sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state -->
     <array name="cpu.speeds.cluster0">
         <value>384000</value> <!-- 384 MHz CPU speed -->
         <value>460800</value> <!-- 460.8 MHz CPU speed -->
@@ -69,51 +72,51 @@
         <value>1824000</value> <!-- 1824 MHz CPU speed -->
         <value>1958400</value> <!-- 1958.4 MHz CPU speed -->
     </array>
-    <!-- Power consumption when CPU is idle -->

-    <item name="cpu.idle">5.58</item>

-    <item name="cpu.awake">4.92</item>

-    <!-- Power consumption at different speeds -->

+    <!-- Power consumption when CPU is idle -->
+    <item name="cpu.idle">0.144925583</item>
+    <item name="cpu.awake">9.488210416</item>
+    <!-- Power consumption at different speeds -->
     <array name="cpu.active.cluster0">
-        <value>84.45</value> <!-- 384 MHz CPU speed -->
-        <value>88.28</value> <!-- 460.8 MHz CPU speed -->
-        <value>93.66</value> <!-- 600 MHz CPU speed -->
-        <value>99.72</value> <!-- 672 MHz CPU speed -->
-        <value>105.22</value> <!-- 768 MHz CPU speed -->
-        <value>109.89</value> <!-- 864 MHz CPU speed -->
-        <value>115.43</value> <!-- 960 MHz CPU speed -->
-        <value>131.33</value> <!-- 1248 MHz CPU speed -->
-        <value>137.06</value> <!-- 1344 MHz CPU speed -->
-        <value>154.40</value> <!-- 1478 MHz CPU speed -->
-        <value>163.35</value> <!-- 1555.2 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 384 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 460.8 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 600 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 672 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 768 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 864 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 960 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 1248 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 1344 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 1478 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 1555.2 MHz CPU speed -->
     </array>
     <array name="cpu.active.cluster1">
-        <value>148.27</value> <!-- 384 MHz CPU speed -->
-        <value>161.72</value> <!-- 480 MHz CPU speed -->
-        <value>184.99</value> <!-- 633.6 MHz CPU speed -->
-        <value>213.12</value> <!-- 768 MHz CPU speed -->
-        <value>243.38</value> <!-- 864 MHz CPU speed -->
-        <value>263.99</value> <!-- 960 MHz CPU speed -->
-        <value>339.19</value> <!-- 1248 MHz CPU speed -->
-        <value>358.75</value> <!-- 1344 MHz CPU speed -->
-        <value>394.00</value> <!-- 1440 MHz CPU speed -->
-        <value>414.56</value> <!-- 1536 MHz CPU speed -->
-        <value>453.77</value> <!-- 1632 MHz CPU speed -->
-        <value>481.19</value> <!-- 1728 MHz CPU speed -->
-        <value>523.73</value> <!-- 1824 MHz CPU speed -->
-        <value>583.81</value> <!-- 1958.4 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 384 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 480 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 633.6 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 768 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 864 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 960 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 1248 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 1344 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 1440 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 1536 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 1632 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 1728 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 1824 MHz CPU speed -->
+        <value>379.9659093</value> <!-- 1958.4 MHz CPU speed -->
     </array>
     <array name="cpu.clusters.cores">
         <value>4</value> <!-- Cluster 0 has 4 cores (cpu0, cpu1, cpu2, cpu3) -->
         <value>4</value> <!-- Cluster 1 has 4 cores (cpu4, cpu5, cpu6, cpu7) -->
     </array>
-    <!-- This is the battery capacity in mAh -->

-    <item name="battery.capacity">3450</item>

-

-    <array name="wifi.batchedscan"> <!-- mA.  Current figures based on .0801 s/c and 75.48mA while scanning -->

-        <value>.0003</value> <!-- 1-8/hr -->

-        <value>.003</value>  <!-- 9-64/hr -->

-        <value>.03</value>   <!-- 65-512/hr -->

-        <value>.3</value>    <!-- 513-4,096/hr -->

-        <value>3</value>    <!-- 4097-/hr -->

-    </array>

-</device>

+    <!-- This is the battery capacity in mAh -->
+    <item name="battery.capacity">3450</item>
+
+    <array name="wifi.batchedscan"> <!-- mA.  Current figures based on .0801 s/c and 75.48mA while scanning -->
+        <value>.0003</value> <!-- 1-8/hr -->
+        <value>.003</value>  <!-- 9-64/hr -->
+        <value>.03</value>   <!-- 65-512/hr -->
+        <value>.3</value>    <!-- 513-4,096/hr -->
+        <value>3</value>    <!-- 4097-/hr -->
+    </array>
+</device>