diff --git a/overlay/OPlusFrameworksResTarget/res/xml/power_profile.xml b/overlay/OPlusFrameworksResTarget/res/xml/power_profile.xml
index 4bc34dd..914552c 100644
--- a/overlay/OPlusFrameworksResTarget/res/xml/power_profile.xml
+++ b/overlay/OPlusFrameworksResTarget/res/xml/power_profile.xml
@@ -1,163 +1,247 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
+-->
 <device name="Android">
-    <item name="none">0</item>
-    <item name="screen.on">176</item>
-    <item name="screen.full">460</item>
-    <array name="cpu.clusters.cores">
-        <value>4</value>
-        <value>3</value>
-        <value>1</value>
-    </array>
-    <array name="cpu.core_speeds.cluster0">
-        <value>300000</value>
-        <value>403200</value>
-        <value>499200</value>
-        <value>595200</value>
-        <value>691200</value>
-        <value>806400</value>
-        <value>902400</value>
-        <value>998400</value>
-        <value>1094400</value>
-        <value>1209600</value>
-        <value>1305600</value>
-        <value>1401600</value>
-        <value>1497600</value>
-        <value>1612800</value>
-        <value>1708800</value>
-        <value>1804800</value>
-    </array>
-    <array name="cpu.core_power.cluster0">
-        <value>5</value>
-        <value>7</value>
-        <value>8</value>
-        <value>9</value>
-        <value>10</value>
-        <value>14</value>
-        <value>16</value>
-        <value>18</value>
-        <value>21</value>
-        <value>23</value>
-        <value>24</value>
-        <value>27</value>
-        <value>29</value>
-        <value>31</value>
-        <value>32</value>
-        <value>35</value>
-    </array>
-    <array name="cpu.core_speeds.cluster1">
-        <value>710400</value>
-        <value>844800</value>
-        <value>960000</value>
-        <value>1075200</value>
-        <value>1209600</value>
-        <value>1324800</value>
-        <value>1440000</value>
-        <value>1555200</value>
-        <value>1670400</value>
-        <value>1766400</value>
-        <value>1881600</value>
-        <value>1996800</value>
-        <value>2112000</value>
-        <value>2227200</value>
-        <value>2342400</value>
-        <value>2419200</value>
-    </array>
-    <array name="cpu.core_power.cluster1">
-        <value>31</value>
-        <value>39</value>
-        <value>47</value>
-        <value>59</value>
-        <value>70</value>
-        <value>81</value>
-        <value>94</value>
-        <value>103</value>
-        <value>122</value>
-        <value>137</value>
-        <value>160</value>
-        <value>182</value>
-        <value>192</value>
-        <value>220</value>
-        <value>270</value>
-        <value>317</value>
-    </array>
-    <array name="cpu.core_speeds.cluster2">
-        <value>844800</value>
-        <value>960000</value>
-        <value>1075200</value>
-        <value>1190400</value>
-        <value>1305600</value>
-        <value>1420800</value>
-        <value>1555200</value>
-        <value>1670400</value>
-        <value>1785600</value>
-        <value>1900800</value>
-        <value>2035200</value>
-        <value>2150400</value>
-        <value>2265600</value>
-        <value>2380800</value>
-        <value>2496000</value>
-        <value>2611200</value>
-        <value>2726400</value>
-        <value>2841600</value>
-    </array>
-    <array name="cpu.core_power.cluster2">
-        <value>49</value>
-        <value>59</value>
-        <value>69</value>
-        <value>82</value>
-        <value>96</value>
-        <value>113</value>
-        <value>133</value>
-        <value>157</value>
-        <value>172</value>
-        <value>182</value>
-        <value>210</value>
-        <value>247</value>
-        <value>289</value>
-        <value>332</value>
-        <value>374</value>
-        <value>471</value>
-        <value>516</value>
-        <value>583</value>
-    </array>
-    <item name="cpu.active">7.7</item>
-    <item name="cpu.idle">0.1</item>
-    <item name="cpu.suspend">0</item>
-    <item name="battery.capacity">4500</item>
-    <item name="wifi.on">0.1</item>
-    <item name="wifi.active">160</item>
-    <item name="wifi.scan">1.2</item>
-    <item name="dsp.audio">24</item>
-    <item name="dsp.video">66</item>
-    <item name="camera.flashlight">600</item>
-    <item name="camera.avg">368</item>
-    <item name="gps.on">13.7</item>
-    <item name="radio.active">160</item>
-    <item name="radio.scanning">5.5</item>
-    <array name="radio.on">
-        <value>86</value>
-        <value>8</value>
-    </array>
-    <item name="modem.controller.idle">6</item>
-    <item name="modem.controller.rx">180</item>
-    <item name="modem.controller.tx">186</item>
-    <item name="modem.controller.voltage">3700</item>
-    <array name="memory.bandwidths">
-        <value>17</value>
-    </array>
-    <item name="wifi.controller.idle">1</item>
-    <item name="wifi.controller.rx">176</item>
-    <item name="wifi.controller.tx">200</item>
-    <array name="wifi.controller.tx_levels">1 </array>
-    <item name="wifi.controller.voltage">3700</item>
-    <array name="wifi.batchedscan">
-        <value>.0001</value>
-        <value>.001</value>
-        <value>.01</value>
-        <value>.1</value>
-        <value>1</value>
-    </array>
-    <item name="bluetooth.active">130</item>
-    <item name="bluetooth.on">0.7</item>
-    <item name="bluetooth.controller.voltage">3700</item>
+  <!-- Most values are the incremental current used by a feature,
+       in mA (measured at nominal voltage).
+       The default values are deliberately incorrect dummy values.
+       OEM's must measure and provide actual values before
+       shipping a device.
+       Example real-world values are given in comments, but they
+       are totally dependent on the platform and can vary
+       significantly, so should be measured on the shipping platform
+       with a power meter. -->
+  <item name="none">0</item>
+  <item name="ambient on">53.35</item>
+  <item name="screen.on">93.32</item>  <!-- ~200mA -->
+  <item name="screen.full">202.46</item>  <!-- ~300mA -->
+  <item name="bluetooth.active">46</item> <!-- Bluetooth data transfer, ~10mA -->
+  <item name="bluetooth.on">1.7</item>  <!-- Bluetooth on & connectable, but not connected, ~0.1mA -->
+  <item name="wifi.on">1.8</item>  <!-- ~3mA -->
+  <item name="wifi.active">223</item>  <!-- WIFI data transfer, ~200mA -->
+  <item name="wifi.scan">120</item>  <!-- WIFI network scanning, ~100mA -->
+  <item name="audio">0</item> <!-- ~10mA -->
+  <item name="video">0</item> <!-- ~50mA -->
+  <item name="camera.flashlight">108</item> <!-- Avg. power for camera flash, ~160mA -->
+  <item name="camera.avg">1047</item> <!-- Avg. power use of camera in standard usecases, ~550mA -->
+  <item name="gps.on">75</item> <!-- ~50mA -->
+
+  <item name="dsp.audio">78</item> <!-- new add ~10mA -->
+  <item name="dsp.video">51</item> <!-- new add ~50mA -->
+  <item name="bluetooth.controller.idle">1.7</item>  <!--new add -->
+  <item name="bluetooth.controller.rx">76</item>  <!--new add  -->
+  <item name="bluetooth.controller.tx">176</item>  <!--new add  -->
+  <item name="bluetooth.controller.voltage">3300</item>  <!--new add -->
+
+  <!-- Radio related values. For modems without energy reporting support in firmware, use
+       radio.active, radio.scanning, and radio.on. -->
+  <item name="radio.active">161.5</item> <!-- ~200mA -->
+  <item name="radio.scanning">133.5</item> <!-- cellular radio scanning for signal, ~10mA -->
+  <!-- Current consumed by the radio at different signal strengths, when paging -->
+  <array name="radio.on"> <!-- Strength 0 to BINS-1 delete 1 line-->
+      <value>1.2</value> <!-- ~2mA -->
+  </array>
+
+
+  <!-- Radio related values. For modems WITH energy reporting support in firmware, use
+       modem.controller.idle, modem.controller.tx, modem.controller.rx, modem.controller.voltage.
+       -->
+  <item name="modem.controller.idle">1</item>
+  <item name="modem.controller.rx">180.8</item>
+  <array name="modem.controller.tx">
+      <value>168.4</value>
+      <value>183.8</value>
+      <value>221.3</value>
+      <value>374.6</value>
+      <value>542.8.8</value>
+  </array>
+  <item name="modem.controller.voltage">800</item>
+
+  <!-- A list of heterogeneous CPU clusters, where the value for each cluster represents the
+       number of CPU cores for that cluster.
+
+       Ex:
+       <array name="cpu.clusters.cores">
+         <value>4</value> // cluster 0 has cpu0, cpu1, cpu2, cpu3
+         <value>2</value> // cluster 1 has cpu4, cpu5
+       </array> -->
+  <array name="cpu.clusters.cores">
+      <value>4</value> <!-- cluster 0 has cpu0, cpu1, cpu2, cpu3 -->
+      <value>3</value> <!-- cluster 1 has cpu4, cpu5, cpu6 -->
+      <value>1</value> <!-- cluster 2 has cpu7 -->
+  </array>
+
+    <!-- Different CPU speeds for cluster 0 as reported in
+       /sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state.
+
+       There must be one of these for each cluster, labeled:
+       cpu.speeds.cluster0, cpu.speeds.cluster1, etc... -->
+  <array name="cpu.core_speeds.cluster0">
+      <value>300000</value>   <!-- 300   MHz CPU speed -->
+      <value>403200</value>   <!-- 403   MHz CPU speed -->
+      <value>499200</value>   <!-- 499   MHz CPU speed -->
+      <value>595200</value>   <!-- 595   MHz CPU speed -->
+      <value>691200</value>   <!-- 691   MHz CPU speed -->
+      <value>806400</value>   <!-- 806   MHz CPU speed -->
+      <value>902400</value>   <!-- 902   MHz CPU speed -->
+      <value>998400</value>   <!-- 998   MHz CPU speed -->
+      <value>1094400</value>  <!-- 300   MHz CPU speed -->
+      <value>1209600</value>  <!-- 1094  MHz CPU speed -->
+      <value>1305600</value>  <!-- 1305  MHz CPU speed -->
+      <value>1401600</value>  <!-- 1401  MHz CPU speed -->
+      <value>1497600</value>  <!-- 1497  MHz CPU speed -->
+      <value>1612800</value>  <!-- 1612  MHz CPU speed -->
+      <value>1708800</value>  <!-- 1708  MHz CPU speed -->
+      <value>1804800</value>  <!-- 1804  MHz CPU speed -->
+  </array>
+
+  <array name="cpu.core_speeds.cluster1">
+      <value>710400</value>   <!-- 710   MHz CPU speed -->
+      <value>844800</value>   <!-- 844   MHz CPU speed -->
+      <value>960000</value>   <!-- 960   MHz CPU speed -->
+      <value>1075200</value>  <!-- 1075  MHz CPU speed -->
+      <value>1209600</value>  <!-- 1209  MHz CPU speed -->
+      <value>1324800</value>  <!-- 1324  MHz CPU speed -->
+      <value>1440000</value>  <!-- 1440  MHz CPU speed -->
+      <value>1555200</value>  <!-- 1555  MHz CPU speed -->
+      <value>1670400</value>  <!-- 1670  MHz CPU speed -->
+      <value>1766400</value>  <!-- 1766  MHz CPU speed -->
+      <value>1881600</value>  <!-- 1881  MHz CPU speed -->
+      <value>1996800</value>  <!-- 1996  MHz CPU speed -->
+      <value>2112000</value>  <!-- 2112  MHz CPU speed -->
+      <value>2227200</value>  <!-- 2227  MHz CPU speed -->
+      <value>2342400</value>  <!-- 2342  MHz CPU speed -->
+      <value>2419200</value>  <!-- 2419  MHz CPU speed -->
+  </array>
+
+  <array name="cpu.core_speeds.cluster2">
+      <value>844800</value>   <!-- 844   MHz CPU speed -->
+      <value>960000</value>   <!-- 960   MHz CPU speed -->
+      <value>1075200</value>  <!-- 1075  MHz CPU speed -->
+      <value>1190400</value>  <!-- 1190  MHz CPU speed -->
+      <value>1305600</value>  <!-- 1305  MHz CPU speed -->
+      <value>1420800</value>  <!-- 1420  MHz CPU speed -->
+      <value>1555200</value>  <!-- 1555  MHz CPU speed -->
+      <value>1670400</value>  <!-- 1670  MHz CPU speed -->
+      <value>1785600</value>  <!-- 1785  MHz CPU speed -->
+      <value>1900800</value>  <!-- 1900  MHz CPU speed -->
+      <value>2035200</value>  <!-- 2035  MHz CPU speed -->
+      <value>2150400</value>  <!-- 2150  MHz CPU speed -->
+      <value>2265600</value>  <!-- 2265  MHz CPU speed -->
+      <value>2380800</value>  <!-- 2380  MHz CPU speed -->
+      <value>2496000</value>  <!-- 2496  MHz CPU speed -->
+      <value>2592000</value>  <!-- 2592  MHz CPU speed -->
+      <value>2688000</value>  <!-- 2688  MHz CPU speed -->
+      <value>2764800</value>  <!-- 2764  MHz CPU speed -->
+      <value>2841600</value>  <!-- 2841  MHz CPU speed -->
+  </array>
+
+  <!-- Current at each CPU speed for cluster 0, as per 'cpu.speeds.cluster0'.
+       Like cpu.speeds.cluster0, there must be one of these present for
+       each heterogeneous CPU cluster. -->
+  <array name="cpu.core_power.cluster0">
+      <value>5</value>   <!-- ~5 mA -->
+      <value>5</value>   <!-- ~5 mA -->
+      <value>6</value>   <!-- ~6 mA -->
+      <value>6</value>   <!-- ~6 mA -->
+      <value>6</value>   <!-- ~6 mA -->
+      <value>7</value>   <!-- ~7 mA -->
+      <value>8</value>   <!-- ~8 mA -->
+      <value>9</value>   <!-- ~9 mA -->
+      <value>11</value>  <!-- ~11mA -->
+      <value>12</value>  <!-- ~12mA -->
+      <value>14</value>  <!-- ~14mA -->
+      <value>15</value>  <!-- ~15mA -->
+      <value>17</value>  <!-- ~17mA -->
+      <value>20</value>  <!-- ~20mA -->
+      <value>22</value>  <!-- ~22mA -->
+      <value>32</value>  <!-- ~32mA -->
+  </array>
+
+  <!-- Current at each CPU speed for cluster 1, as per 'cpu.speeds.cluster1'.
+       Like cpu.speeds.cluster1, there must be one of these present for
+       each heterogeneous CPU cluster. -->
+  <array name="cpu.core_power.cluster1">
+      <value>23</value>   <!-- ~23 mA -->
+      <value>30</value>   <!-- ~30 mA -->
+      <value>37</value>   <!-- ~37 mA -->
+      <value>46</value>   <!-- ~46 mA -->
+      <value>47</value>   <!-- ~47 mA -->
+      <value>61</value>   <!-- ~61 mA -->
+      <value>71</value>   <!-- ~71 mA -->
+      <value>81</value>   <!-- ~81 mA -->
+      <value>92</value>   <!-- ~92 mA -->
+      <value>101</value>  <!-- ~101mA -->
+      <value>144</value>  <!-- ~144mA -->
+      <value>154</value>  <!-- ~154mA -->
+      <value>182</value>  <!-- ~182mA -->
+      <value>213</value>  <!-- ~213mA -->
+      <value>259</value>  <!-- ~259mA -->
+      <value>266</value>  <!-- ~266mA -->
+  </array>
+
+  <!-- Current at each CPU speed for cluster 2, as per 'cpu.speeds.cluster2'.
+       Like cpu.speeds.cluster2, there must be one of these present for
+       each heterogeneous CPU cluster. -->
+  <array name="cpu.core_power.cluster2">
+      <value>41</value>   <!-- ~41 mA -->
+      <value>50</value>   <!-- ~50 mA -->
+      <value>55</value>   <!-- ~55 mA -->
+      <value>68</value>   <!-- ~68 mA -->
+      <value>74</value>   <!-- ~74 mA -->
+      <value>88</value>   <!-- ~88 mA -->
+      <value>101</value>   <!-- ~101mA -->
+      <value>120</value>   <!-- ~120mA -->
+      <value>135</value>   <!-- ~135mA -->
+      <value>151</value>   <!-- ~151mA -->
+      <value>173</value>   <!-- ~173mA -->
+      <value>201</value>   <!-- ~201mA -->
+      <value>253</value>   <!-- ~253mA -->
+      <value>287</value>   <!-- ~287mA -->
+      <value>330</value>   <!-- ~330mA -->
+      <value>386</value>   <!-- ~386mA -->
+      <value>419</value>   <!-- ~419mA -->
+      <value>449</value>   <!-- ~449mA -->
+      <value>502</value>   <!-- ~502mA -->
+  </array>
+
+  <!-- Current when CPU is awake -->
+  <item name="cpu.awake">15.68</item>
+  <!-- Current when CPU is idle -->
+  <item name="cpu.idle">6.5</item>
+
+  <!-- Memory bandwidth power values in mA at the rail. There must be one value
+       for each bucket defined in the device tree. -->
+  <array name="memory.bandwidths">
+    <value>22.7</value> <!-- mA for bucket: 100mb/s-1.5 GB/s memory bandwidth -->
+  </array>
+
+  <!-- This is the battery capacity in mAh (measured at nominal voltage) -->
+  <item name="battery.capacity">4500</item>
+
+  <!-- Wifi related values. -->
+  <!-- Idle Receive current for wifi radio in mA. 0 by default-->
+  <item name="wifi.controller.idle">1.4</item>
+  <!-- Rx current for wifi radio in mA. 0 by default-->
+  <item name="wifi.controller.rx">177</item>
+  <!-- Tx current for wifi radio in mA. 0 by default-->
+  <item name="wifi.controller.tx">269</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>
+  <!-- Operating volatage for wifi radio in mV. 0 by default-->
+  <item name="wifi.controller.voltage">3300</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>