Power Profile: update sailfish

Updating all power profiles using the same scripts. Previously,
every power profile was generated using different algorithims.
b/62389228

Test: Run a normal android workload and verify the app blame
  is reasonable

Change-Id: I91c34d912d3b1e9654c0cfbc2cf8648d0a6c7b38
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 ff7a3df..f2d5282 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
@@ -18,27 +18,26 @@
 -->
 <device name="Android">
     <!-- All values are in mAh except as noted -->
+
+    <!-- Nothing -->
     <item name="none">0</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">82.2</item>
-    <!-- Current consumed by the radio at different signal strengths, when paging -->
-    <array name="radio.on"> <!-- Strength 0 to BINS-1 -->
-        <value>2.2</value>
-        <value>1.6</value>
+
+    <!-- This is the battery capacity in mAh -->
+    <item name="battery.capacity">2770</item>
+
+    <!-- Number of cores each CPU cluster contains -->
+    <array name="cpu.clusters.cores">
+        <value>2</value> <!-- Cluster 0 has 2 cores (cpu0, cpu1) -->
+        <value>2</value> <!-- Cluster 1 has 2 cores (cpu2, cpu3) -->
     </array>
 
+    <!-- Power consumption when CPU is suspended -->
+    <item name="cpu.idle">5.837</item>
+    <!-- Additional power consumption when CPU is in a kernel idle loop -->
+    <item name="cpu.awake">1.334</item>
+
     <!-- Different CPU speeds as reported in
-         /sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state -->
+         /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies -->
     <array name="cpu.speeds.cluster0">
         <value>307200</value> <!-- 307 MHz CPU speed -->
         <value>384000</value> <!-- 384 MHz CPU speed -->
@@ -60,6 +59,8 @@
         <value>1593600</value> <!-- 1593 MHz CPU speed -->
         <value>2188800</value> <!-- 2188 MHz CPU speed -->
     </array>
+    <!-- Different CPU speeds as reported in
+         /sys/devices/system/cpu/cpu2/cpufreq/scaling_available_frequencies -->
     <array name="cpu.speeds.cluster1">
         <value>307200</value> <!-- 307 MHz CPU speed -->
         <value>384000</value> <!-- 384 MHz CPU speed -->
@@ -89,69 +90,104 @@
         <value>2246400</value> <!-- 2246 MHz CPU speed -->
         <value>2342400</value> <!-- 2342 MHz CPU speed -->
     </array>
-    <!-- Power consumption when CPU is idle -->
-    <item name="cpu.idle">6.07</item>
-    <item name="cpu.awake">10</item>
-    <!-- Power consumption at different speeds -->
-    <array name="cpu.active.cluster0">
-        <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>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) -->
-        <value>2</value> <!-- Cluster 1 has 2 cores (cpu2, cpu3) -->
-    </array>
-    <!-- This is the battery capacity in mAh -->
-    <item name="battery.capacity">2770</item>
 
-    <array name="wifi.batchedscan"> <!-- mA.  Current figures based on .0801 s/c and 75.48mA while scanning -->
+    <!-- Additional power used by a CPU from cluster 0 when running at different
+         speeds. Currently this measurement also includes cluster cost. -->
+    <array name="cpu.active.cluster0">
+        <value>85.469</value> <!-- 307 MHz CPU speed -->
+        <value>89.077</value> <!-- 384 MHz CPU speed -->
+        <value>93.613</value> <!-- 460 MHz CPU speed -->
+        <value>99.484</value> <!-- 537 MHz CPU speed -->
+        <value>104.354</value> <!-- 614 MHz CPU speed -->
+        <value>110.456</value> <!-- 691 MHz CPU speed -->
+        <value>117.363</value> <!-- 768 MHz CPU speed -->
+        <value>124.483</value> <!-- 844 MHz CPU speed -->
+        <value>131.595</value> <!-- 902 MHz CPU speed -->
+        <value>142.148</value> <!-- 979 MHz CPU speed -->
+        <value>148.988</value> <!-- 1056 MHz CPU speed -->
+        <value>161.208</value> <!-- 1132 MHz CPU speed -->
+        <value>172.076</value> <!-- 1209 MHz CPU speed -->
+        <value>180.408</value> <!-- 1286 MHz CPU speed -->
+        <value>194.546</value> <!-- 1363 MHz CPU speed -->
+        <value>208.077</value> <!-- 1440 MHz CPU speed -->
+        <value>230.631</value> <!-- 1516 MHz CPU speed -->
+        <value>240.685</value> <!-- 1593 MHz CPU speed -->
+    </array>
+    <!-- Additional power used by a CPU from cluster 1 when running at different
+         speeds. Currently this measurement also includes cluster cost. -->
+    <array name="cpu.active.cluster1">
+        <value>88.153</value> <!-- 307 MHz CPU speed -->
+        <value>91.961</value> <!-- 384 MHz CPU speed -->
+        <value>95.946</value> <!-- 460 MHz CPU speed -->
+        <value>100.114</value> <!-- 537 MHz CPU speed -->
+        <value>105.312</value> <!-- 614 MHz CPU speed -->
+        <value>109.813</value> <!-- 691 MHz CPU speed -->
+        <value>117.502</value> <!-- 748 MHz CPU speed -->
+        <value>123.326</value> <!-- 825 MHz CPU speed -->
+        <value>134.812</value> <!-- 902 MHz CPU speed -->
+        <value>141.443</value> <!-- 979 MHz CPU speed -->
+        <value>152.063</value> <!-- 1056 MHz CPU speed -->
+        <value>162.983</value> <!-- 1132 MHz CPU speed -->
+        <value>173.355</value> <!-- 1209 MHz CPU speed -->
+        <value>181.407</value> <!-- 1286 MHz CPU speed -->
+        <value>197.883</value> <!-- 1363 MHz CPU speed -->
+        <value>205.834</value> <!-- 1440 MHz CPU speed -->
+        <value>222.465</value> <!-- 1516 MHz CPU speed -->
+        <value>235.804</value> <!-- 1593 MHz CPU speed -->
+        <value>251.473</value> <!-- 1670 MHz CPU speed -->
+        <value>276.347</value> <!-- 1747 MHz CPU speed -->
+        <value>287.241</value> <!-- 1824 MHz CPU speed -->
+        <value>320.050</value> <!-- 1900 MHz CPU speed -->
+        <value>334.874</value> <!-- 1977 MHz CPU speed -->
+        <value>361.991</value> <!-- 2054 MHz CPU speed -->
+        <value>385.875</value> <!-- 2150 MHz CPU speed -->
+    </array>
+
+    <!-- Additional power used when screen is turned on at minimum brightness -->
+    <item name="screen.on">122.780</item>
+    <!-- Additional power used when screen is at maximum brightness, compared to
+         screen at minimum brightness -->
+    <item name="screen.full">200.356</item>
+
+    <!-- Average power used by the camera flash module when on -->
+    <item name="camera.flashlight">245.805</item>
+    <!-- Average power use by the camera subsystem for a typical camera
+         application. Intended as a rough estimate for an application running a
+         preview and capturing approximately 10 full-resolution pictures per
+         minute. -->
+    <item name="camera.avg">987.217</item>
+
+    <!-- Additional power used when audio decoding/encoding via DSP -->
+    <item name="dsp.audio">25.000</item>
+
+    <!-- Additional power used when GPS is acquiring a signal -->
+    <item name="gps.on">10.23</item>
+
+    <!-- Additional power used when Wi-Fi is turned on but not receiving,
+         transmitting, or scanning -->
+    <item name="wifi.on">2</item>
+    <!-- Additional power used when transmitting or receiving over Wi-Fi -->
+    <item name="wifi.active">160</item>
+    <!-- Additional power used when Wi-Fi is scanning for access points -->
+    <item name="wifi.scan">25</item>
+
+    <!-- mA. Current figures based on .0801 s/c and 75.48mA while scanning -->
+    <array name="wifi.batchedscan">
         <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>
+
+    <!-- Additional power used when cellular radio is transmitting/receiving -->
+    <item name="radio.active">300</item>
+    <!-- The current consumed by the radio when it is scanning for a signal -->
+    <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>2.2</value>
+        <value>1.6</value>
+    </array>
+
 </device>