Revert to measured values for power profile.

Test: Build, run, check batterystats & battery panel
Bug: 38342875
Change-Id: If1031c164881454d5892f4ca05be076cd61e6f64

1 files changed, 63 insertions, 66 deletions

diff --git a/sailfish/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/sailfish/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index c4f34058..ff7a3df7 100644
--- a/sailfish/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/sailfish/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -19,25 +19,22 @@
 <device name="Android">
     <!-- All values are in mAh except as noted -->
     <item name="none">0</item>
-    <item name="screen.on">129.388</item>
-    <item name="screen.full">148.51</item>
-    <item name="bluetooth.active">0</item>
-    <item name="bluetooth.on">0</item>
-    <item name="wifi.on">20.5048</item>
-    <item name="wifi.active">8.71016</item>
-    <item name="wifi.scan">366.954</item>
-    <item name="dsp.audio">0</item>
-    <item name="gps.on">31.6648</item>
-    <item name="radio.active">64.8882</item>
+    <item name="screen.on">88.160</item>
+    <item name="screen.full">224.582</item>
+    <item name="bluetooth.active">89.69</item>
+    <item name="bluetooth.on">8.46</item>
+    <item name="wifi.on">2</item>
+    <item name="wifi.active">160</item>
+    <item name="wifi.scan">25</item>
+    <item name="dsp.audio">29</item>
+    <item name="gps.on">10.23</item>
+    <item name="radio.active">300</item>
     <!-- The current consumed by the radio when it is scanning for a signal -->
-    <item name="radio.scanning">2.34129</item>
+    <item name="radio.scanning">82.2</item>
     <!-- Current consumed by the radio at different signal strengths, when paging -->
     <array name="radio.on"> <!-- Strength 0 to BINS-1 -->
-        <value>9.23215</value>
-        <value>2.09043</value>
-        <value>5.20192</value>
-        <value>4.73961</value>
-        <value>4.65342</value>
+        <value>2.2</value>
+        <value>1.6</value>
     </array>
 
     <!-- Different CPU speeds as reported in
@@ -93,55 +90,55 @@
         <value>2342400</value> <!-- 2342 MHz CPU speed -->
     </array>
     <!-- Power consumption when CPU is idle -->
-    <item name="cpu.idle">3.09496</item>
-    <item name="cpu.awake">2.30213</item>
+    <item name="cpu.idle">6.07</item>
+    <item name="cpu.awake">10</item>
     <!-- Power consumption at different speeds -->
     <array name="cpu.active.cluster0">
-        <value>180.978</value> <!-- 307 MHz CPU speed -->
-        <value>180.978</value> <!-- 384 MHz CPU speed -->
-        <value>180.978</value> <!-- 460 MHz CPU speed -->
-        <value>180.978</value> <!-- 537 MHz CPU speed -->
-        <value>180.978</value> <!-- 614 MHz CPU speed -->
-        <value>180.978</value> <!-- 691 MHz CPU speed -->
-        <value>180.978</value> <!-- 768 MHz CPU speed -->
-        <value>180.978</value> <!-- 844 MHz CPU speed -->
-        <value>180.978</value> <!-- 902 MHz CPU speed -->
-        <value>180.978</value> <!-- 979 MHz CPU speed -->
-        <value>180.978</value> <!-- 1056 MHz CPU speed -->
-        <value>180.978</value> <!-- 1132 MHz CPU speed -->
-        <value>180.978</value> <!-- 1209 MHz CPU speed -->
-        <value>180.978</value> <!-- 1286 MHz CPU speed -->
-        <value>180.978</value> <!-- 1363 MHz CPU speed -->
-        <value>180.978</value> <!-- 1440 MHz CPU speed -->
-        <value>180.978</value> <!-- 1516 MHz CPU speed -->
-        <value>180.978</value> <!-- 1593 MHz CPU speed -->
+        <value>70</value> <!-- 307 MHz CPU speed -->
+        <value>74</value> <!-- 384 MHz CPU speed -->
+        <value>81</value> <!-- 460 MHz CPU speed -->
+        <value>88</value> <!-- 537 MHz CPU speed -->
+        <value>97</value> <!-- 614 MHz CPU speed -->
+        <value>103</value> <!-- 691 MHz CPU speed -->
+        <value>120</value> <!-- 768 MHz CPU speed -->
+        <value>132</value> <!-- 844 MHz CPU speed -->
+        <value>137</value> <!-- 902 MHz CPU speed -->
+        <value>150</value> <!-- 979 MHz CPU speed -->
+        <value>168</value> <!-- 1056 MHz CPU speed -->
+        <value>183</value> <!-- 1132 MHz CPU speed -->
+        <value>197</value> <!-- 1209 MHz CPU speed -->
+        <value>216</value> <!-- 1286 MHz CPU speed -->
+        <value>246</value> <!-- 1363 MHz CPU speed -->
+        <value>274</value> <!-- 1440 MHz CPU speed -->
+        <value>286</value> <!-- 1516 MHz CPU speed -->
+        <value>318</value> <!-- 1593 MHz CPU speed -->
     </array>
     <array name="cpu.active.cluster1">
-        <value>180.978</value> <!-- 307 MHz CPU speed -->
-        <value>180.978</value> <!-- 384 MHz CPU speed -->
-        <value>180.978</value> <!-- 460 MHz CPU speed -->
-        <value>180.978</value> <!-- 537 MHz CPU speed -->
-        <value>180.978</value> <!-- 614 MHz CPU speed -->
-        <value>180.978</value> <!-- 691 MHz CPU speed -->
-        <value>180.978</value> <!-- 748 MHz CPU speed -->
-        <value>180.978</value> <!-- 825 MHz CPU speed -->
-        <value>180.978</value> <!-- 902 MHz CPU speed -->
-        <value>180.978</value> <!-- 979 MHz CPU speed -->
-        <value>180.978</value> <!-- 1056 MHz CPU speed -->
-        <value>180.978</value> <!-- 1132 MHz CPU speed -->
-        <value>180.978</value> <!-- 1209 MHz CPU speed -->
-        <value>180.978</value> <!-- 1286 MHz CPU speed -->
-        <value>180.978</value> <!-- 1363 MHz CPU speed -->
-        <value>180.978</value> <!-- 1440 MHz CPU speed -->
-        <value>180.978</value> <!-- 1516 MHz CPU speed -->
-        <value>180.978</value> <!-- 1593 MHz CPU speed -->
-        <value>180.978</value> <!-- 1670 MHz CPU speed -->
-        <value>180.978</value> <!-- 1747 MHz CPU speed -->
-        <value>180.978</value> <!-- 1824 MHz CPU speed -->
-        <value>180.978</value> <!-- 1900 MHz CPU speed -->
-        <value>180.978</value> <!-- 1977 MHz CPU speed -->
-        <value>180.978</value> <!-- 2054 MHz CPU speed -->
-        <value>180.978</value> <!-- 2150 MHz CPU speed -->
+        <value>73</value> <!-- 307 MHz CPU speed -->
+        <value>76</value> <!-- 384 MHz CPU speed -->
+        <value>83</value> <!-- 460 MHz CPU speed -->
+        <value>90</value> <!-- 537 MHz CPU speed -->
+        <value>99</value> <!-- 614 MHz CPU speed -->
+        <value>105</value> <!-- 691 MHz CPU speed -->
+        <value>114</value> <!-- 748 MHz CPU speed -->
+        <value>130</value> <!-- 825 MHz CPU speed -->
+        <value>139</value> <!-- 902 MHz CPU speed -->
+        <value>152</value> <!-- 979 MHz CPU speed -->
+        <value>170</value> <!-- 1056 MHz CPU speed -->
+        <value>185</value> <!-- 1132 MHz CPU speed -->
+        <value>199</value> <!-- 1209 MHz CPU speed -->
+        <value>218</value> <!-- 1286 MHz CPU speed -->
+        <value>248</value> <!-- 1363 MHz CPU speed -->
+        <value>276</value> <!-- 1440 MHz CPU speed -->
+        <value>288</value> <!-- 1516 MHz CPU speed -->
+        <value>320</value> <!-- 1593 MHz CPU speed -->
+        <value>338</value> <!-- 1670 MHz CPU speed -->
+        <value>382</value> <!-- 1747 MHz CPU speed -->
+        <value>414</value> <!-- 1824 MHz CPU speed -->
+        <value>480</value> <!-- 1900 MHz CPU speed -->
+        <value>499</value> <!-- 1977 MHz CPU speed -->
+        <value>543</value> <!-- 2054 MHz CPU speed -->
+        <value>607</value> <!-- 2150 MHz CPU speed -->
     </array>
     <array name="cpu.clusters.cores">
         <value>2</value> <!-- Cluster 0 has 2 cores (cpu0, cpu1) -->
@@ -151,10 +148,10 @@
     <item name="battery.capacity">2770</item>
 
     <array name="wifi.batchedscan"> <!-- mA.  Current figures based on .0801 s/c and 75.48mA while scanning -->
-        <value>0</value> <!-- 1-8/hr -->
-        <value>0</value>  <!-- 9-64/hr -->
-        <value>0</value>   <!-- 65-512/hr -->
-        <value>0</value>    <!-- 513-4,096/hr -->
-        <value>0</value>    <!-- 4097-/hr -->
+        <value>0.0002</value> <!-- 1-8/hr -->
+        <value>0.002</value>  <!-- 9-64/hr -->
+        <value>0.02</value>   <!-- 65-512/hr -->
+        <value>0.2</value>    <!-- 513-4,096/hr -->
+        <value>2</value>    <!-- 4097-/hr -->
     </array>
 </device>