release-request-e64ca0c4-2b43-4758-b238-0b8c6fabc365-for-git_oc-mr1-release-4207446 snap-temp-L19600000085022555

Change-Id: If4ce9d7fcf1fd1c7d864b7dda441b21f4392a4a2

1 files changed, 101 insertions, 62 deletions

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 1c44e72..43a17c2 100644
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -18,45 +18,43 @@
 -->
 <device name="Android">
     <!-- All values are in mA except as noted -->
+
+    <!-- Nothing -->
     <item name="none">0</item>
-    <item name="screen.on">159.667124493062</item>
-    <item name="screen.full">203.327990537703</item>
-    <item name="bluetooth.active">84.4</item>
-    <item name="bluetooth.on">0.43</item>
-    <item name="wifi.on">0.56</item>
-    <item name="wifi.active">172.99</item>
-    <item name="wifi.scan">25.7523644684504</item>
-    <item name="dsp.audio">100.88</item>
-    <item name="dsp.video">187.86</item>
-    <item name="gps.on">21.3112768663199</item>
-    <item name="radio.active">91.859655777944</item>
-    <!-- The current consumed by the radio when it is scanning for a signal -->
-    <item name="radio.scanning">4.56959643376497</item>
-    <!-- Current consumed by the radio at different signal strengths, when paging -->
-    <array name="radio.on"> <!-- Strength 0 to BINS-1 -->
-        <value>14.718992198734</value>
-        <value>7.11953513364874</value>
-	<value>9.67242765594385</value>
-	<value>10.9664724655329</value>
-	<value>5.9382806608961</value>
+
+    <!-- This is the battery capacity in mAh -->
+    <item name="battery.capacity">2700</item>
+
+    <!-- Number of cores each CPU cluster contains -->
+    <array name="cpu.clusters.cores">
+        <value>4</value> <!-- Cluster 0 has 4 cores (cpu0, cpu1, cpu2, cpu3) -->
+        <value>2</value> <!-- Cluster 1 has 2 cores (cpu4, cpu5) -->
     </array>
+
+    <!-- Power consumption when CPU is suspended -->
+    <item name="cpu.idle">0.075</item>
+    <!-- Additional power consumption when CPU is in a kernel idle loop -->
+    <item name="cpu.awake">4.397</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>384000</value> <!-- 384 MHz CPU speed -->
-        <value>460800</value> <!-- 460.8 MHz CPU speed -->
+        <value>460800</value> <!-- 460 MHz CPU speed -->
         <value>600000</value> <!-- 600 MHz CPU speed -->
         <value>672000</value> <!-- 672 MHz CPU speed -->
-        <value>787200</value> <!-- 787.2 MHz CPU speed -->
+        <value>787200</value> <!-- 787 MHz CPU speed -->
         <value>864000</value> <!-- 864 MHz CPU speed -->
         <value>960000</value> <!-- 960 MHz CPU speed -->
         <value>1248000</value> <!-- 1248 MHz CPU speed -->
         <value>1440000</value> <!-- 1440 MHz CPU speed -->
     </array>
+    <!-- Different CPU speeds as reported in
+         /sys/devices/system/cpu/cpu4/cpufreq/scaling_available_frequencies -->
     <array name="cpu.speeds.cluster1">
         <value>384000</value> <!-- 384 MHz CPU speed -->
         <value>480000</value> <!-- 480 MHz CPU speed -->
-        <value>633600</value> <!-- 633.6 MHz CPU speed -->
+        <value>633600</value> <!-- 633 MHz CPU speed -->
         <value>768000</value> <!-- 768 MHz CPU speed -->
         <value>864000</value> <!-- 864 MHz CPU speed -->
         <value>960000</value> <!-- 960 MHz CPU speed -->
@@ -65,53 +63,80 @@
         <value>1440000</value> <!-- 1440 MHz CPU speed -->
         <value>1536000</value> <!-- 1536 MHz CPU speed -->
         <value>1632000</value> <!-- 1632 MHz CPU speed -->
-        <value>1689600</value> <!-- 1689.6 MHz CPU speed -->
+        <value>1689600</value> <!-- 1689 MHz CPU speed -->
         <value>1824000</value> <!-- 1824 MHz CPU speed -->
     </array>
-    <!-- Power consumption when CPU is idle -->
-    <item name="cpu.idle">3.46965169575592</item>
-    <item name="cpu.awake">1.34521161231221</item>
-    <!-- Power consumption at different speeds -->
+
+    <!-- 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>102.762</value> <!-- 384 MHz CPU speed -->
-        <value>108.702</value> <!-- 460.8 MHz CPU speed -->
-        <value>117.097</value> <!-- 600 MHz CPU speed -->
-        <value>126.066</value> <!-- 672 MHz CPU speed -->
-        <value>134.956</value> <!-- 787.2 MHz CPU speed -->
-        <value>152.321</value> <!-- 864 MHz CPU speed -->
-        <value>174.992</value> <!-- 960 MHz CPU speed -->
-        <value>232.194</value> <!-- 1248 MHz CPU speed -->
-        <value>275.754</value> <!-- 1440 MHz CPU speed -->
+        <value>77.358</value> <!-- 384 MHz CPU speed -->
+        <value>82.744</value> <!-- 460 MHz CPU speed -->
+        <value>85.913</value> <!-- 600 MHz CPU speed -->
+        <value>91.972</value> <!-- 672 MHz CPU speed -->
+        <value>97.483</value> <!-- 787 MHz CPU speed -->
+        <value>105.882</value> <!-- 864 MHz CPU speed -->
+        <value>113.951</value> <!-- 960 MHz CPU speed -->
+        <value>142.006</value> <!-- 1248 MHz CPU speed -->
+        <value>165.514</value> <!-- 1440 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>308.385</value> <!-- 384 MHz CPU speed -->
-        <value>309.652</value> <!-- 480 MHz CPU speed -->
-        <value>310.345</value> <!-- 633.6 MHz CPU speed -->
-        <value>366.795</value> <!-- 768 MHz CPU speed -->
-        <value>407.682</value> <!-- 864 MHz CPU speed -->
-        <value>449.222</value> <!-- 960 MHz CPU speed -->
-        <value>597.979</value> <!-- 1248 MHz CPU speed -->
-        <value>658.785</value> <!-- 1344 MHz CPU speed -->
-        <value>723.789</value> <!-- 1440 MHz CPU speed -->
-        <value>801.563</value> <!-- 1536 MHz CPU speed -->
-        <value>889.732</value> <!-- 1632 MHz CPU speed -->
-        <value>941.965</value> <!-- 1689.6 MHz CPU speed -->
-        <value>1074.40</value> <!-- 1824 MHz CPU speed -->
+        <value>132.714</value> <!-- 384 MHz CPU speed -->
+        <value>146.321</value> <!-- 480 MHz CPU speed -->
+        <value>167.495</value> <!-- 633 MHz CPU speed -->
+        <value>194.391</value> <!-- 768 MHz CPU speed -->
+        <value>211.625</value> <!-- 864 MHz CPU speed -->
+        <value>231.291</value> <!-- 960 MHz CPU speed -->
+        <value>298.062</value> <!-- 1248 MHz CPU speed -->
+        <value>325.774</value> <!-- 1344 MHz CPU speed -->
+        <value>353.432</value> <!-- 1440 MHz CPU speed -->
+        <value>389.501</value> <!-- 1536 MHz CPU speed -->
+        <value>427.866</value> <!-- 1632 MHz CPU speed -->
+        <value>444.878</value> <!-- 1689 MHz CPU speed -->
+        <value>496.031</value> <!-- 1824 MHz CPU speed -->
     </array>
-    <array name="cpu.clusters.cores">
-        <value>4</value> <!-- Cluster 0 has 4 cores (cpu0, cpu1, cpu2, cpu3) -->
-        <value>2</value> <!-- Cluster 1 has 2 cores (cpu4, cpu5) -->
-    </array>
-    <!-- This is the battery capacity in mAh -->
-    <item name="battery.capacity">2700</item>
 
-    <array name="wifi.batchedscan"> <!-- mA.  Current figures based on .0801 s/c and 75.48mA while scanning -->
-        <value>.0076</value> <!-- 1-8/hr -->
-        <value>.0613</value>  <!-- 9-64/hr -->
-        <value>.4845</value>   <!-- 65-512/hr -->
+    <!-- Additional power used when screen is turned on at minimum brightness -->
+    <item name="screen.on">97.690</item>
+    <!-- Additional power used when screen is at maximum brightness, compared to
+         screen at minimum brightness -->
+    <item name="screen.full">171.856</item>
+
+    <!-- Average power used by the camera flash module when on -->
+    <item name="camera.flashlight">266.707</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">889.245</item>
+
+    <!-- Additional power used when audio decoding/encoding via DSP -->
+    <item name="dsp.audio">34.523</item>
+    <!-- Additional power used when video decoding via DSP -->
+    <item name="dsp.video">187.86</item>
+
+    <!-- Additional power used when GPS is acquiring a signal -->
+    <item name="gps.on">21.3112768663199</item>
+
+    <!-- Additional power used when Wi-Fi is turned on but not receiving,
+         transmitting, or scanning -->
+    <item name="wifi.on">0.56</item>
+    <!-- Additional power used when transmitting or receiving over Wi-Fi -->
+    <item name="wifi.active">172.99</item>
+    <!-- Additional power used when Wi-Fi is scanning for access points -->
+    <item name="wifi.scan">25.7523644684504</item>
+
+    <!-- mA.  Current figures based on .0801 s/c and 75.48mA while scanning -->
+    <array name="wifi.batchedscan">
+        <value>0.0076</value>   <!-- 1-8/hr -->
+        <value>0.0613</value>   <!-- 9-64/hr -->
+        <value>0.4845</value>   <!-- 65-512/hr -->
         <value>3.870</value>    <!-- 513-4096/hr -->
-        <value>30.96</value>   <!-- 4097-?/hr -->
+        <value>30.96</value>    <!-- 4097-?/hr -->
     </array>
+
     <!-- 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 -->
@@ -280,4 +305,18 @@
         <value>2.324374274</value>
         <value>2.355329002</value>
     </array>
+
+    <!-- Additional power used when cellular radio is transmitting/receiving -->
+    <item name="radio.active">91.859655777944</item>
+    <!-- The current consumed by the radio when it is scanning for a signal -->
+    <item name="radio.scanning">4.56959643376497</item>
+    <!-- Current consumed by the radio at different signal strengths, when paging -->
+    <array name="radio.on"> <!-- Strength 0 to BINS-1 -->
+        <value>14.718992198734</value>
+        <value>7.11953513364874</value>
+	    <value>9.67242765594385</value>
+	    <value>10.9664724655329</value>
+	    <value>5.9382806608961</value>
+    </array>
+
 </device>