From 605228a63cf30c776fe8b167c62dacb50fdf8e9e Mon Sep 17 00:00:00 2001
From: William Tai <williamtai@google.com>
Date: Sat, 12 Feb 2022 10:57:22 +0800
Subject: [PATCH 1/7] display : update color data file

Update disply color data for LHBM.

Bug: 199469421
Test: adb shell displaycolor_service 653
Change-Id: I608f4bab5a7c7d9210c6401bae44270cbab8241b
---
 panther/display_colordata_dev_cal0.pb | Bin 988 -> 1426 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/panther/display_colordata_dev_cal0.pb b/panther/display_colordata_dev_cal0.pb
index a1600ae31d490f4e00e135ca9399597545751334..7f2691455fca694d668937c2464fc338e2b5bebe 100644
GIT binary patch
literal 1426
zcmd7RJC4&}6oz4J$JfNM<J@fLX3-#7k(f9WBd7o&(IINOK%CJ?Ln4u(pmPNh)oGwU
z(9r&f4X}i>gtLTy2N1#t4H>92-B-TSqtAJ4DZY{@skfQG+`L|$j5m2PUA~xR^}F-Q
z;wa0Gvt^bqihI#Xu_|88&x=L!{7tf6F3(O^MRLAgpFPx`+<tKLR%%+${72yjCAGHW
zqY}PVck7)RezJG#vmO5M(r=n$PG-|_md}DOn)6<9RNqa?BrTO2_oV`=P+3JyYN8@5
zLT4QfHqc}fEw<1WHag@$m8wvq8o1;_o$94W9{A)#gBlP}08MH_i(1g8Hgu>1UFt$e
zp$sX4m}2Nr5Bk)H0S#bCLm1JhOoHna6JMv8om!UX<NVI?RW+eV1yxc(BMmB40iAR(
z$N-bf(jrS*WJ_B(?1-wYikhqmSGuAu>*%qEKKt0<1_m5plbhJ$7Ph&K9qwS4yBKna
z5l0wvj6LpQpZhrA0S<X6wr+cBhmF}&J8Vq)Rde*C@nn`=F?;&UOK!!!YkcuEsS87H
npC&J!Mt`1$m!5{6xMcSGY5y`SqyL%Vi1*A69P_u?fn$CGQf&bG

literal 988
zcmd7Py-wRu7=U4pPZHZF#CDt?JK;xGmr7P7hy$tG2@n!nFQ8i>4nl%NYSMx2o2b<3
zEHEEfSih<lz`2BT3BH8y4rt1ND!~rhJHFB*jvN-Sgr)v`bTR)iJ?+hh`CxJ~$h^;^
z{&+jfcCtw}9Oqv;r};GhK3e4C<oGg~O(y4O(>z(sX6Fa|>(>5<kE!i^3l8IJmO9J0
zVeysqR6niw)_tlwH-7ZfKU~=T-9c~oX(znr;ujNEP)i_5fvxNTGfY{=A`3ZjEKv!|
zR8|#J0bASP7)QFs1)&90brn|iD%5n1YRWU7^tBIx4xp~<5b6*bx&ckolr7VeZPSJb
zBZ^d9#ImD1)WI%wagEk+oz`)KHgGe1Pcz;3G?V`3qP*Sf?`E%=DNAz2H8)(AbP3A;
z%&<Zgw8=(?9CXQ5q7brb{xd_5Jms6EnOT})y{N0O2vwtKU=vz;X@+fTtEh-%tYdgK
TQ_p6w`S8;0EoWYsz2(ebY1CG@


From 3ca336a5a4dba2abfff34ff8c646f7ea16d1b5f1 Mon Sep 17 00:00:00 2001
From: William Tai <williamtai@google.com>
Date: Sun, 13 Feb 2022 23:40:47 +0800
Subject: [PATCH 2/7] display : add color data file

Add disply color data file.

Bug: 199468488
Test: adb shell displaycolor_service 653
Change-Id: I2d67a763c546d77cb7b4887f3af88ad25fbe2031
---
 cheetah/display_colordata_sdc-s6e3hc4_cal0.pb | Bin 0 -> 1385 bytes
 device-cheetah.mk                             |   3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 cheetah/display_colordata_sdc-s6e3hc4_cal0.pb

diff --git a/cheetah/display_colordata_sdc-s6e3hc4_cal0.pb b/cheetah/display_colordata_sdc-s6e3hc4_cal0.pb
new file mode 100644
index 0000000000000000000000000000000000000000..c9fc154ddabe0f6738fe5ca31ff37c143899c11b
GIT binary patch
literal 1385
zcmd7RJC4&(6o6rDCvoD~j^p_Kit8v6v1cX-Dxjfb4*@&_(vV1GDCllYb(U~D+Kbr0
zUBX$yS;Acc284tr^qC#}(x=~gHP$?>)>gCQ?&I<E{$_pLb{Fs8UbgP8X?C0K#iqGx
zHcu~~r8nKa`?S03-qmlu)Q9Wq+YkG$zB?RlUmC9;zgYb+EVF5!tlM_ue>1GFnx%VA
z&FU4?9zAC|*HKrxFwlSj4q!+_HKY-kXu=rBFu@5}Xu%YxV51EVI^d!UGn#RaJU*v6
z_tA$1EqFiy4=LmkMLedMCzSA%Ql3%9bIN%^1uv=O6;*smOIG_2DJFYJF~8N?wpm|o
zn^QH?K$kk{(5tb5?A1iCCPr!`Ol69(8jFdV2uoRFs;0tLws4dqT;+<Hnh8&NVy@=G
zS3WKvzyLxFA;Jh^j3L1UQcNMk406n&zyeAvp~4E5c&c{Zn0spHjahv+tl?(ewA)j&
zUtY}My%+C4Q-i-^+@ya_`(p<7|IMI3jV<JY1u|fv3|S;27R#6=GGVDqStc`<%bXRm
VV5KZsB`da+r)KAkxo39Xn4j{Q?_~f0

literal 0
HcmV?d00001

diff --git a/device-cheetah.mk b/device-cheetah.mk
index 65b2c2d..5a2146b 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -60,7 +60,8 @@ PRODUCT_COPY_FILES += \
 # Display Config
 PRODUCT_COPY_FILES += \
         device/google/pantah/cheetah/display_colordata_boe-nt37290_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_boe-nt37290_cal0.pb \
-        device/google/pantah/cheetah/display_colordata_sdc-s6e3hc3-c10_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_sdc-s6e3hc3-c10_cal0.pb
+        device/google/pantah/cheetah/display_colordata_sdc-s6e3hc3-c10_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_sdc-s6e3hc3-c10_cal0.pb \
+        device/google/pantah/cheetah/display_colordata_sdc-s6e3hc4_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_sdc-s6e3hc4_cal0.pb
 
 # Display LBE
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1

From 790649ba23a4c17e02c3ea333234b84bab74d38d Mon Sep 17 00:00:00 2001
From: William Tai <williamtai@google.com>
Date: Sun, 13 Feb 2022 23:43:36 +0800
Subject: [PATCH 3/7] display : update color data file

Update disply color data for LHBM.

Bug: 203594609
Test: adb shell displaycolor_service 653
Change-Id: Ifda684838351babe226dfe763a2d60298c60e274
---
 cheetah/display_colordata_boe-nt37290_cal0.pb | Bin 947 -> 1367 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/cheetah/display_colordata_boe-nt37290_cal0.pb b/cheetah/display_colordata_boe-nt37290_cal0.pb
index 082bf72f68403a51fe437adcc1bdae732a65f48c..52df64dfd2d1dfe6944b219154d837fe6ce5523b 100644
GIT binary patch
literal 1367
zcmd7ROHRU26o6rGOKG{#2j$uFXvc)awkSqN=){?E38EG>QAh*_jyyw$EJ4S{<SgMV
zfhDknvjmNCf-a!$;7`8%^3)KH2u06cjPDnZvuS@ZOb0htgTxxg@i-a|qIf@!4)>0{
zX*x?E#>@0NynG7hlgZufEDe|Q`Q3?nwtL+BP^F$EaesdpyKky|5mIr?5W?Q`PBa3s
z5w8j>sIrPV&`5(k<v}MM3^JfV1&}16NJS`72~0A<A`5J?!666AR0fw^s89u}RD~MV
zpiXsYPy?FO1dlxM$%huTpiOP)PzSoyg@6JG-T#x~|DTlJyDGJ)A1A}#TBD1VSc{di
zR#xg-UF9~pSB*8ya~^fp(O?4$TtLYZi(JGKm(XMrEw<2R8y$AA%w=@h#R^xj%2lj!
z4eMOT1~;(DP4w79pM7j`3)|er4tKE2T?{tCmR7bYTUyzseBTu(2mK_8{&<~(pf9h@
U&t06uZ?6pQ8fBWY?UiZDCtlIpasU7T

literal 947
zcmd7POHRT-7yw|W)AA^fmh$Qg(se^(O97)Rb>q%ER4r(NkN_^+&Dzy}gznsq@d7=<
ze}p;09KeOfC2mdN24C{&Hx*)%fP}_2ecryT7NhMfOCIl&aWjqMG@2z*JdLCC$%V7X
zR@o-qWe>sKYp|ZrmrtuK*sa&gYkGTn6@F5^98Z(c>}+DaQ~izTirENQ5HfOd$%!Pn
zf(oOYN}8)e%{8IrB~gMhmZ5?bsA3g#)S-qosAC-(*kH|~$qa5tgPYRiEz!y?VL=<)
z&?!2sTXbcY_hgUvML)NN4GucsqRYI(V?OtV4+9*04Xk6rxW|MEKd7!nqj)<0dnO52
ugaWkq8RIIdOe-|`k7u&aZE15yIJqla@X!Mvf5%{m!@aY^V)o7si}?l`OHp$G


From ba2ac351b515fc45f489e95a26ec690cdd61390c Mon Sep 17 00:00:00 2001
From: Midas Chien <midaschieh@google.com>
Date: Tue, 15 Feb 2022 14:39:03 +0800
Subject: [PATCH 4/7] display: enable smooth display by default

Turn on Smooth Display in Settings App by default. Users can disable it
in Settings App.

Bug: 219650450
Test: Smooth Display is enabled by default after factory reset
Change-Id: I3acc5d548bad8a5068a75140673512ba793890e8
---
 .../overlay/frameworks/base/core/res/res/values/config.xml | 7 +++++++
 .../overlay/frameworks/base/core/res/res/values/config.xml | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
index faad22c..11670d0 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
@@ -143,6 +143,13 @@
     <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>
     <integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer>
 
+    <!-- The default refresh rate. We manage this using the peak refresh rate setting. Set this
+         value to 0 so it has no effect. -->
+    <integer name="config_defaultRefreshRate">0</integer>
+
+    <!-- The default peak refresh rate. -->
+    <integer name="config_defaultPeakRefreshRate">120</integer>
+
     <!-- MMS user agent string -->
     <string name="config_mms_user_agent" translatable="false">ge2ae</string>
     <!-- MMS user agent profile url -->
diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml
index dc57f3e..b64ae87 100644
--- a/panther/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml
@@ -142,6 +142,13 @@
     <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>
     <integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer>
 
+    <!-- The default refresh rate. We manage this using the peak refresh rate setting. Set this
+         value to 0 so it has no effect. -->
+    <integer name="config_defaultRefreshRate">0</integer>
+
+    <!-- The default peak refresh rate. -->
+    <integer name="config_defaultPeakRefreshRate">90</integer>
+
     <!-- MMS user agent string -->
     <string name="config_mms_user_agent" translatable="false">gqml3</string>
     <!-- MMS user agent profile url -->

From a34fbb728403f4c1b101e4440afd71ab9c0bc964 Mon Sep 17 00:00:00 2001
From: Roger Wang <wangroger@google.com>
Date: Wed, 16 Feb 2022 22:38:33 +0800
Subject: [PATCH 5/7] wifi: configuration update

Align configuration as following.
1. Dual AP interface
2. verbose logging always on
3. hotspot MFP

Bug: 219927253
Test: dual hotspot can be turned ON and client can connect to hotspot
Change-Id: I0885b55c37135fe632b597bc605a8f281c0448b2
---
 rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++
 wifi/BoardConfig-wifi.mk                       | 7 +++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 0c8bf62..d900cef 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -136,4 +136,10 @@
 
     <!-- Indicate the driver doesn't support NL80211 Reg changed event -->
     <bool translatable="false" name="config_wifiDriverSupportedNl80211RegChangedEvent">false</bool>
+
+    <!-- Indicate whether the verbose logging is always on -->
+    <!-- 0: verbose logging controlled by user
+         1: verbose logging on by default for userdebug
+         2: verbose logging on by default for all builds -->
+    <integer translatable="false" name="config_wifiVerboseLoggingAlwaysOnLevel">1</integer>
 </resources>
diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk
index ed491ad..64a6fb5 100644
--- a/wifi/BoardConfig-wifi.mk
+++ b/wifi/BoardConfig-wifi.mk
@@ -14,19 +14,22 @@
 # limitations under the License.
 #
 
+# WiFi
 BOARD_WLAN_DEVICE := bcmdhd
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd
 BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd
 WPA_SUPPLICANT_VERSION := VER_0_8_X
 BOARD_WPA_SUPPLICANT_DRIVER := NL80211
 BOARD_HOSTAPD_DRIVER := NL80211
-# Wifi interface combination - {1 STA + 1 AP (bridged or single)} or {2 STA + 1 of (P2P or NAN)}
-WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}}, {{{STA}, 2}, {{P2P, NAN}, 1}}
+# Wifi interface combination - {1 STA + 1 AP} or {1 STA + 1 AP_BRIDGED} or {1 STA + 1 P2P}
+# or {1 STA + 1 NAN} or {2 STA}
+WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{P2P, NAN, AP, AP_BRIDGED}, 1}}, {{{STA}, 2}}
 WIFI_FEATURE_WIFI_EXT_HAL := true
 WIFI_FEATURE_IMU_DETECTION := true
 # Avoid Wifi reset on MAC Address change
 WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true
 WIFI_FEATURE_HOSTAPD_11AX := true
+BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true
 
 PRODUCT_COPY_FILES += \
     device/google/pantah/wifi/p2p_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant.conf \

From d321e3f11277d865c4d0367bcf088055f3408a63 Mon Sep 17 00:00:00 2001
From: samou <samou@google.com>
Date: Wed, 16 Feb 2022 09:21:43 +0000
Subject: [PATCH 6/7] Create initial power_profile.xml

Bug: 219368899
Change-Id: I38c0c65e5be0b4ae3fb22637f3273d039b1fd685
---
 .../base/core/res/res/xml/power_profile.xml   | 218 ++++++++++++++++++
 .../base/core/res/res/xml/power_profile.xml   | 218 ++++++++++++++++++
 2 files changed, 436 insertions(+)
 create mode 100644 cheetah/overlay/frameworks/base/core/res/res/xml/power_profile.xml
 create mode 100644 panther/overlay/frameworks/base/core/res/res/xml/power_profile.xml

diff --git a/cheetah/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/cheetah/overlay/frameworks/base/core/res/res/xml/power_profile.xml
new file mode 100644
index 0000000..476ba4e
--- /dev/null
+++ b/cheetah/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2018, 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">
+    <item name="battery.capacity">5000</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) -->
+      <value>2</value> <!-- Cluster 2 has 2 cores (cpu6, cpu7) -->
+    </array>
+
+    <!-- TODO(b/219870109): cpu numbers need to update using DVT.-->
+    <item name="cpu.suspend">10</item>
+    <item name="cpu.idle">28.6</item>
+    <item name="cpu.active">12.37</item>
+    <item name="cpu.cluster_power.cluster0">0.24</item>
+    <item name="cpu.cluster_power.cluster1">3.23</item>
+    <item name="cpu.cluster_power.cluster2">5.94</item>
+
+    <!-- Different CPU speeds as reported in
+         /sys/devices/system/cpu/cpufreq/ploicy0/scaling_available_frequencies -->
+    <array name="cpu.core_speeds.cluster0">
+      <value>300000</value> <!-- 300 MHz CPU speed -->
+      <value>574000</value> <!-- 574 MHz CPU speed -->
+      <value>738000</value> <!-- 738 MHz CPU speed -->
+      <value>930000</value> <!-- 930 MHz CPU speed -->
+      <value>1098000</value> <!-- 1098 MHz CPU speed -->
+      <value>1197000</value> <!-- 1197 MHz CPU speed -->
+      <value>1328000</value> <!-- 1328 MHz CPU speed -->
+      <value>1401000</value> <!-- 1401 MHz CPU speed -->
+      <value>1598000</value> <!-- 1598 MHz CPU speed -->
+      <value>1704000</value> <!-- 1704 MHz CPU speed -->
+      <value>1803000</value> <!-- 1803 MHz CPU speed -->
+      <value>1950000</value> <!-- 1950 MHz CPU speed -->
+      <value>2024000</value> <!-- 2024 MHz CPU speed -->
+    </array>
+
+    <!-- Different CPU speeds as reported in
+         /sys/devices/system/cpu/cpufreq/ploicy4/scaling_available_frequencies -->
+    <array name="cpu.core_speeds.cluster1">
+      <value>400000</value> <!-- 400 MHz CPU speed -->
+      <value>553000</value> <!-- 553 MHz CPU speed -->
+      <value>696000</value> <!-- 696 MHz CPU speed -->
+      <value>799000</value> <!-- 799 MHz CPU speed -->
+      <value>910000</value> <!-- 910 MHz CPU speed -->
+      <value>1024000</value> <!-- 1024 MHz CPU speed -->
+      <value>1197000</value> <!-- 1197 MHz CPU speed -->
+      <value>1328000</value> <!-- 1328 MHz CPU speed -->
+      <value>1491000</value> <!-- 1491 MHz CPU speed -->
+      <value>1663000</value> <!-- 1663 MHz CPU speed -->
+      <value>1836000</value> <!-- 1836 MHz CPU speed -->
+      <value>1999000</value> <!-- 1999 MHz CPU speed -->
+      <value>2130000</value> <!-- 2130 MHz CPU speed -->
+      <value>2253000</value> <!-- 2253 MHz CPU speed -->
+      <value>2348000</value> <!-- 2348 MHz CPU speed -->
+    </array>
+
+    <!-- Different CPU speeds as reported in
+         /sys/devices/system/cpu/cpufreq/ploicy6/scaling_available_frequencies -->
+    <array name="cpu.core_speeds.cluster2">
+      <value>500000</value> <!-- 500 MHz CPU speed -->
+      <value>851000</value> <!-- 851 MHz CPU speed -->
+      <value>984000</value> <!-- 984 MHz CPU speed -->
+      <value>1106000</value> <!-- 1106 MHz CPU speed -->
+      <value>1277000</value> <!-- 1277 MHz CPU speed -->
+      <value>1426000</value> <!-- 1426 MHz CPU speed -->
+      <value>1582000</value> <!-- 1582 MHz CPU speed -->
+      <value>1745000</value> <!-- 1745 MHz CPU speed -->
+      <value>1826000</value> <!-- 1826 MHz CPU speed -->
+      <value>2048000</value> <!-- 2048 MHz CPU speed -->
+      <value>2188000</value> <!-- 2188 MHz CPU speed -->
+      <value>2252000</value> <!-- 2252 MHz CPU speed -->
+      <value>2401000</value> <!-- 2401 MHz CPU speed -->
+      <value>2507000</value> <!-- 2507 MHz CPU speed -->
+      <value>2630000</value> <!-- 2630 MHz CPU speed -->
+      <value>2704000</value> <!-- 2704 MHz CPU speed -->
+      <value>2802000</value> <!-- 2802 MHz CPU speed -->
+      <value>2850000</value> <!-- 2850 MHz CPU speed -->
+    </array>
+
+    <!-- Additional power used by a CPU core from cluster 0 when running at
+         different speeds, excluding cluster and active cost -->
+    <array name="cpu.core_power.cluster0">
+      <value>1.89</value> <!-- 300 MHz CPU speed -->
+      <value>6.15</value> <!-- 574 MHz CPU speed -->
+      <value>9.34</value> <!-- 738 MHz CPU speed -->
+      <value>14.22</value> <!-- 930 MHz CPU speed -->
+      <value>18.94</value> <!-- 1098 MHz CPU speed -->
+      <value>21.98</value> <!-- 1197 MHz CPU speed -->
+      <value>26.83</value> <!-- 1328 MHz CPU speed -->
+      <value>30.17</value> <!-- 1401 MHz CPU speed -->
+      <value>41.55</value> <!-- 1598 MHz CPU speed -->
+      <value>48.36</value> <!-- 1704 MHz CPU speed -->
+      <value>58.45</value> <!-- 1803 MHz CPU speed -->
+      <value>73</value> <!-- 1950 MHz CPU speed -->
+      <value>80</value> <!-- 2024 MHz CPU speed -->
+    </array>
+
+    <!-- Additional power used by a CPU core from cluster 1 when running at
+         different speeds, excluding cluster and active cost -->
+    <array name="cpu.core_power.cluster1">
+      <value>3.71</value> <!-- 400 MHz CPU speed -->
+      <value>6.16</value> <!-- 553 MHz CPU speed -->
+      <value>8</value> <!-- 696 MHz CPU speed -->
+      <value>10.94</value> <!-- 799 MHz CPU speed -->
+      <value>12.73</value> <!-- 910 MHz CPU speed -->
+      <value>14.4</value> <!-- 1024 MHz CPU speed -->
+      <value>21.39</value> <!-- 1197 MHz CPU speed -->
+      <value>24.1</value> <!-- 1328 MHz CPU speed -->
+      <value>30.42</value> <!-- 1491 MHz CPU speed -->
+      <value>42.49</value> <!-- 1663 MHz CPU speed -->
+      <value>49.37</value> <!-- 1836 MHz CPU speed -->
+      <value>58.09</value> <!-- 1999 MHz CPU speed -->
+      <value>67.54</value> <!-- 2130 MHz CPU speed -->
+      <value>79.04</value> <!-- 2253 MHz CPU speed -->
+      <value>87</value> <!-- 2348 MHz CPU speed -->
+    </array>
+
+    <!-- Additional power used by a CPU core from cluster 2 when running at
+         different speeds, excluding cluster and active cost -->
+    <array name="cpu.core_power.cluster2">
+      <value>8.36</value> <!-- 500 MHz CPU speed -->
+      <value>16.33</value> <!-- 851 MHz CPU speed -->
+      <value>19.44</value> <!-- 984 MHz CPU speed -->
+      <value>36.71</value> <!-- 1106 MHz CPU speed -->
+      <value>41.42</value> <!-- 1277 MHz CPU speed -->
+      <value>48.24</value> <!-- 1426 MHz CPU speed -->
+      <value>54.77</value> <!-- 1582 MHz CPU speed -->
+      <value>65.32</value> <!-- 1745 MHz CPU speed -->
+      <value>69.58</value> <!-- 1826 MHz CPU speed -->
+      <value>128.49</value> <!-- 2048 MHz CPU speed -->
+      <value>142.15</value> <!-- 2188 MHz CPU speed -->
+      <value>149.74</value> <!-- 2252 MHz CPU speed -->
+      <value>164.78</value> <!-- 2401 MHz CPU speed -->
+      <value>188.68</value> <!-- 2507 MHz CPU speed -->
+      <value>193.15</value> <!-- 2630 MHz CPU speed -->
+      <value>227.98</value> <!-- 2704 MHz CPU speed -->
+      <value>254.25</value> <!-- 2802 MHz CPU speed -->
+      <value>267</value> <!-- 2850 MHz CPU speed -->
+    </array>
+
+    <!-- Additional power used when screen is ambient mode -->
+    <item name="ambient.on">32</item>
+
+    <!-- Additional power used when screen is turned on at minimum brightness -->
+    <item name="screen.on">98</item>
+    <!-- Additional power used when screen is at maximum brightness, compared to
+         screen at minimum brightness -->
+    <item name="screen.full">470</item>
+
+    <!-- Average power used by the camera flash module when on -->
+    <item name="camera.flashlight">240.47</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">900</item>
+
+    <!-- Additional power used when video is playing -->
+    <item name="video">25</item>
+    <!-- Additional power used when audio is playing -->
+    <item name="audio">75</item>
+
+    <!-- Cellular modem related values.-->
+    <item name="modem.controller.sleep">0</item>
+    <item name="modem.controller.idle">156</item>
+    <item name="modem.controller.rx">145</item>
+    <array name="modem.controller.tx"> <!-- Strength 0 to 4 -->
+        <value>153</value>
+        <value>212</value>
+        <value>292</value>
+        <value>359</value>
+        <value>471</value>
+    </array>
+    <item name="modem.controller.voltage">3700</item>
+
+    <!-- GPS related values.-->
+    <array name="gps.signalqualitybased"> <!-- Strength 0 to 1 -->
+        <value>14.33</value>
+        <value>12.79</value>
+    </array>
+    <item name="gps.voltage">3700</item>
+
+    <!-- Idle Receive current for wifi radio in mA.-->
+    <item name="wifi.controller.idle">38</item>
+    <!-- Rx current for wifi radio in mA.-->
+    <item name="wifi.controller.rx">98</item>
+    <!-- Tx current for wifi radio in mA-->
+    <item name="wifi.controller.tx">470</item>
+    <!-- Operating voltage for wifi radio in mV.-->
+    <item name="wifi.controller.voltage">3700</item>
+
+    <!-- Idle current for bluetooth in mA.-->
+    <item name="bluetooth.controller.idle">2.2</item>
+    <!-- Rx current for bluetooth in mA.-->
+    <item name="bluetooth.controller.rx">5.8</item>
+    <!-- Tx current for bluetooth in mA-->
+    <item name="bluetooth.controller.tx">20</item>
+    <!-- Operating voltage for bluetooth in mV.-->
+    <item name="bluetooth.controller.voltage">3850</item>
+</device>
+
diff --git a/panther/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/panther/overlay/frameworks/base/core/res/res/xml/power_profile.xml
new file mode 100644
index 0000000..3322606
--- /dev/null
+++ b/panther/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2018, 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">
+    <item name="battery.capacity">4315</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) -->
+      <value>2</value> <!-- Cluster 2 has 2 cores (cpu6, cpu7) -->
+    </array>
+
+    <!-- TODO(b/219870109): cpu numbers need to update using DVT.-->
+    <item name="cpu.suspend">10</item>
+    <item name="cpu.idle">28.6</item>
+    <item name="cpu.active">12.37</item>
+    <item name="cpu.cluster_power.cluster0">0.24</item>
+    <item name="cpu.cluster_power.cluster1">3.23</item>
+    <item name="cpu.cluster_power.cluster2">5.94</item>
+
+    <!-- Different CPU speeds as reported in
+         /sys/devices/system/cpu/cpufreq/ploicy0/scaling_available_frequencies -->
+    <array name="cpu.core_speeds.cluster0">
+      <value>300000</value> <!-- 300 MHz CPU speed -->
+      <value>574000</value> <!-- 574 MHz CPU speed -->
+      <value>738000</value> <!-- 738 MHz CPU speed -->
+      <value>930000</value> <!-- 930 MHz CPU speed -->
+      <value>1098000</value> <!-- 1098 MHz CPU speed -->
+      <value>1197000</value> <!-- 1197 MHz CPU speed -->
+      <value>1328000</value> <!-- 1328 MHz CPU speed -->
+      <value>1401000</value> <!-- 1401 MHz CPU speed -->
+      <value>1598000</value> <!-- 1598 MHz CPU speed -->
+      <value>1704000</value> <!-- 1704 MHz CPU speed -->
+      <value>1803000</value> <!-- 1803 MHz CPU speed -->
+      <value>1950000</value> <!-- 1950 MHz CPU speed -->
+      <value>2024000</value> <!-- 2024 MHz CPU speed -->
+    </array>
+
+    <!-- Different CPU speeds as reported in
+         /sys/devices/system/cpu/cpufreq/ploicy4/scaling_available_frequencies -->
+    <array name="cpu.core_speeds.cluster1">
+      <value>400000</value> <!-- 400 MHz CPU speed -->
+      <value>553000</value> <!-- 553 MHz CPU speed -->
+      <value>696000</value> <!-- 696 MHz CPU speed -->
+      <value>799000</value> <!-- 799 MHz CPU speed -->
+      <value>910000</value> <!-- 910 MHz CPU speed -->
+      <value>1024000</value> <!-- 1024 MHz CPU speed -->
+      <value>1197000</value> <!-- 1197 MHz CPU speed -->
+      <value>1328000</value> <!-- 1328 MHz CPU speed -->
+      <value>1491000</value> <!-- 1491 MHz CPU speed -->
+      <value>1663000</value> <!-- 1663 MHz CPU speed -->
+      <value>1836000</value> <!-- 1836 MHz CPU speed -->
+      <value>1999000</value> <!-- 1999 MHz CPU speed -->
+      <value>2130000</value> <!-- 2130 MHz CPU speed -->
+      <value>2253000</value> <!-- 2253 MHz CPU speed -->
+      <value>2348000</value> <!-- 2348 MHz CPU speed -->
+    </array>
+
+    <!-- Different CPU speeds as reported in
+         /sys/devices/system/cpu/cpufreq/ploicy6/scaling_available_frequencies -->
+    <array name="cpu.core_speeds.cluster2">
+      <value>500000</value> <!-- 500 MHz CPU speed -->
+      <value>851000</value> <!-- 851 MHz CPU speed -->
+      <value>984000</value> <!-- 984 MHz CPU speed -->
+      <value>1106000</value> <!-- 1106 MHz CPU speed -->
+      <value>1277000</value> <!-- 1277 MHz CPU speed -->
+      <value>1426000</value> <!-- 1426 MHz CPU speed -->
+      <value>1582000</value> <!-- 1582 MHz CPU speed -->
+      <value>1745000</value> <!-- 1745 MHz CPU speed -->
+      <value>1826000</value> <!-- 1826 MHz CPU speed -->
+      <value>2048000</value> <!-- 2048 MHz CPU speed -->
+      <value>2188000</value> <!-- 2188 MHz CPU speed -->
+      <value>2252000</value> <!-- 2252 MHz CPU speed -->
+      <value>2401000</value> <!-- 2401 MHz CPU speed -->
+      <value>2507000</value> <!-- 2507 MHz CPU speed -->
+      <value>2630000</value> <!-- 2630 MHz CPU speed -->
+      <value>2704000</value> <!-- 2704 MHz CPU speed -->
+      <value>2802000</value> <!-- 2802 MHz CPU speed -->
+      <value>2850000</value> <!-- 2850 MHz CPU speed -->
+    </array>
+
+    <!-- Additional power used by a CPU core from cluster 0 when running at
+         different speeds, excluding cluster and active cost -->
+    <array name="cpu.core_power.cluster0">
+      <value>1.89</value> <!-- 300 MHz CPU speed -->
+      <value>6.15</value> <!-- 574 MHz CPU speed -->
+      <value>9.34</value> <!-- 738 MHz CPU speed -->
+      <value>14.22</value> <!-- 930 MHz CPU speed -->
+      <value>18.94</value> <!-- 1098 MHz CPU speed -->
+      <value>21.98</value> <!-- 1197 MHz CPU speed -->
+      <value>26.83</value> <!-- 1328 MHz CPU speed -->
+      <value>30.17</value> <!-- 1401 MHz CPU speed -->
+      <value>41.55</value> <!-- 1598 MHz CPU speed -->
+      <value>48.36</value> <!-- 1704 MHz CPU speed -->
+      <value>58.45</value> <!-- 1803 MHz CPU speed -->
+      <value>73</value> <!-- 1950 MHz CPU speed -->
+      <value>80</value> <!-- 2024 MHz CPU speed -->
+    </array>
+
+    <!-- Additional power used by a CPU core from cluster 1 when running at
+         different speeds, excluding cluster and active cost -->
+    <array name="cpu.core_power.cluster1">
+      <value>3.71</value> <!-- 400 MHz CPU speed -->
+      <value>6.16</value> <!-- 553 MHz CPU speed -->
+      <value>8</value> <!-- 696 MHz CPU speed -->
+      <value>10.94</value> <!-- 799 MHz CPU speed -->
+      <value>12.73</value> <!-- 910 MHz CPU speed -->
+      <value>14.4</value> <!-- 1024 MHz CPU speed -->
+      <value>21.39</value> <!-- 1197 MHz CPU speed -->
+      <value>24.1</value> <!-- 1328 MHz CPU speed -->
+      <value>30.42</value> <!-- 1491 MHz CPU speed -->
+      <value>42.49</value> <!-- 1663 MHz CPU speed -->
+      <value>49.37</value> <!-- 1836 MHz CPU speed -->
+      <value>58.09</value> <!-- 1999 MHz CPU speed -->
+      <value>67.54</value> <!-- 2130 MHz CPU speed -->
+      <value>79.04</value> <!-- 2253 MHz CPU speed -->
+      <value>87</value> <!-- 2348 MHz CPU speed -->
+    </array>
+
+    <!-- Additional power used by a CPU core from cluster 2 when running at
+         different speeds, excluding cluster and active cost -->
+    <array name="cpu.core_power.cluster2">
+      <value>8.36</value> <!-- 500 MHz CPU speed -->
+      <value>16.33</value> <!-- 851 MHz CPU speed -->
+      <value>19.44</value> <!-- 984 MHz CPU speed -->
+      <value>36.71</value> <!-- 1106 MHz CPU speed -->
+      <value>41.42</value> <!-- 1277 MHz CPU speed -->
+      <value>48.24</value> <!-- 1426 MHz CPU speed -->
+      <value>54.77</value> <!-- 1582 MHz CPU speed -->
+      <value>65.32</value> <!-- 1745 MHz CPU speed -->
+      <value>69.58</value> <!-- 1826 MHz CPU speed -->
+      <value>128.49</value> <!-- 2048 MHz CPU speed -->
+      <value>142.15</value> <!-- 2188 MHz CPU speed -->
+      <value>149.74</value> <!-- 2252 MHz CPU speed -->
+      <value>164.78</value> <!-- 2401 MHz CPU speed -->
+      <value>188.68</value> <!-- 2507 MHz CPU speed -->
+      <value>193.15</value> <!-- 2630 MHz CPU speed -->
+      <value>227.98</value> <!-- 2704 MHz CPU speed -->
+      <value>254.25</value> <!-- 2802 MHz CPU speed -->
+      <value>267</value> <!-- 2850 MHz CPU speed -->
+    </array>
+
+    <!-- Additional power used when screen is ambient mode -->
+    <item name="ambient.on">32</item>
+
+    <!-- Additional power used when screen is turned on at minimum brightness -->
+    <item name="screen.on">98</item>
+    <!-- Additional power used when screen is at maximum brightness, compared to
+         screen at minimum brightness -->
+    <item name="screen.full">470</item>
+
+    <!-- Average power used by the camera flash module when on -->
+    <item name="camera.flashlight">240.47</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">900</item>
+
+    <!-- Additional power used when video is playing -->
+    <item name="video">25</item>
+    <!-- Additional power used when audio is playing -->
+    <item name="audio">75</item>
+
+    <!-- Cellular modem related values.-->
+    <item name="modem.controller.sleep">0</item>
+    <item name="modem.controller.idle">156</item>
+    <item name="modem.controller.rx">145</item>
+    <array name="modem.controller.tx"> <!-- Strength 0 to 4 -->
+        <value>153</value>
+        <value>212</value>
+        <value>292</value>
+        <value>359</value>
+        <value>471</value>
+    </array>
+    <item name="modem.controller.voltage">3700</item>
+
+    <!-- GPS related values.-->
+    <array name="gps.signalqualitybased"> <!-- Strength 0 to 1 -->
+        <value>14.33</value>
+        <value>12.79</value>
+    </array>
+    <item name="gps.voltage">3700</item>
+
+    <!-- Idle Receive current for wifi radio in mA.-->
+    <item name="wifi.controller.idle">38</item>
+    <!-- Rx current for wifi radio in mA.-->
+    <item name="wifi.controller.rx">98</item>
+    <!-- Tx current for wifi radio in mA-->
+    <item name="wifi.controller.tx">470</item>
+    <!-- Operating voltage for wifi radio in mV.-->
+    <item name="wifi.controller.voltage">3700</item>
+
+    <!-- Idle current for bluetooth in mA.-->
+    <item name="bluetooth.controller.idle">2.2</item>
+    <!-- Rx current for bluetooth in mA.-->
+    <item name="bluetooth.controller.rx">5.8</item>
+    <!-- Tx current for bluetooth in mA-->
+    <item name="bluetooth.controller.tx">20</item>
+    <!-- Operating voltage for bluetooth in mV.-->
+    <item name="bluetooth.controller.voltage">3850</item>
+</device>
+

From cdc1dc5379faf6bb60cf4f8b4b967ae87992b2ed Mon Sep 17 00:00:00 2001
From: Chris Kuiper <ckuiper@google.com>
Date: Wed, 16 Feb 2022 11:37:36 -0800
Subject: [PATCH 7/7] Config: Fine-tune ambient thresholds for brightness
 stability.

Porting to C10/P10.

Bug: 215655995
Test: adb shell dumpsys display and check the log.
Change-Id: I68d2121bb8694aab0e23ab67b5cc2cc5d5b1fdb4
---
 .../base/core/res/res/values/config.xml       | 68 +++++++++++++++++++
 .../base/core/res/res/values/config.xml       | 68 +++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
index 11670d0..04e2cb3 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
@@ -160,4 +160,72 @@
 
     <!-- the number of the max cached processes in the system. -->
     <integer name="config_customizedMaxCachedProcesses">64</integer>
+
+    <integer-array name="config_ambientThresholdLevels">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+        <item>40</item>
+        <item>50</item>
+        <item>60</item>
+        <item>70</item>
+        <item>80</item>
+        <item>90</item>
+        <item>100</item>
+    </integer-array>
+
+    <integer-array name="config_ambientBrighteningThresholds">
+        <item>11373</item>
+        <item>5000</item>
+        <item>4333</item>
+        <item>3666</item>
+        <item>3000</item>
+        <item>2760</item>
+        <item>2520</item>
+        <item>2280</item>
+        <item>2040</item>
+        <item>1800</item>
+        <item>800</item>
+        <item>527</item>
+        <item>500</item>
+        <item>470</item>
+        <item>396</item>
+        <item>322</item>
+        <item>248</item>
+        <item>174</item>
+        <item>99</item>
+        <item>99</item>
+    </integer-array>
+
+    <integer-array name="config_ambientDarkeningThresholds">
+        <item>853</item>
+        <item>700</item>
+        <item>683</item>
+        <item>666</item>
+        <item>650</item>
+        <item>640</item>
+        <item>630</item>
+        <item>620</item>
+        <item>610</item>
+        <item>600</item>
+        <item>500</item>
+        <item>500</item>
+        <item>440</item>
+        <item>385</item>
+        <item>348</item>
+        <item>311</item>
+        <item>274</item>
+        <item>237</item>
+        <item>200</item>
+        <item>200</item>
+    </integer-array>
 </resources>
diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml
index b64ae87..7da20bf 100644
--- a/panther/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml
@@ -159,4 +159,72 @@
 
     <!-- the number of the max cached processes in the system. -->
     <integer name="config_customizedMaxCachedProcesses">64</integer>
+
+    <integer-array name="config_ambientThresholdLevels">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+        <item>40</item>
+        <item>50</item>
+        <item>60</item>
+        <item>70</item>
+        <item>80</item>
+        <item>90</item>
+        <item>100</item>
+    </integer-array>
+
+    <integer-array name="config_ambientBrighteningThresholds">
+        <item>11373</item>
+        <item>5000</item>
+        <item>4333</item>
+        <item>3666</item>
+        <item>3000</item>
+        <item>2760</item>
+        <item>2520</item>
+        <item>2280</item>
+        <item>2040</item>
+        <item>1800</item>
+        <item>800</item>
+        <item>527</item>
+        <item>500</item>
+        <item>470</item>
+        <item>396</item>
+        <item>322</item>
+        <item>248</item>
+        <item>174</item>
+        <item>99</item>
+        <item>99</item>
+    </integer-array>
+
+    <integer-array name="config_ambientDarkeningThresholds">
+        <item>853</item>
+        <item>700</item>
+        <item>683</item>
+        <item>666</item>
+        <item>650</item>
+        <item>640</item>
+        <item>630</item>
+        <item>620</item>
+        <item>610</item>
+        <item>600</item>
+        <item>500</item>
+        <item>500</item>
+        <item>440</item>
+        <item>385</item>
+        <item>348</item>
+        <item>311</item>
+        <item>274</item>
+        <item>237</item>
+        <item>200</item>
+        <item>200</item>
+    </integer-array>
 </resources>