From 14150a77b9aee57e88b3b37ad9b729b3b58f9421 Mon Sep 17 00:00:00 2001
From: SianyiHuang <sianyihuang@google.com>
Date: Tue, 28 Dec 2021 21:02:41 +0800
Subject: [PATCH 1/5] Config: fine tune the ambient threshold to improve the
 brightness stability

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

diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index cf57ec0..d93eb1f 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -311,4 +311,73 @@
 
     <!-- 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/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index 491a4cc..cffd560 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -284,4 +284,73 @@
 
     <!-- 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>

From f844946328ecea1707dda0bd7a13dbc16f212f39 Mon Sep 17 00:00:00 2001
From: Victor Liu <victorliu@google.com>
Date: Tue, 15 Feb 2022 08:23:32 -0800
Subject: [PATCH 2/5] uwb: remove calibration script

The calibration script will be copied higher level device uwb.mk

Bug: 219611318
Test: builds
Signed-off-by: Victor Liu <victorliu@google.com>
Change-Id: I9f799d9a9655b172e1ace8fa0272644f0034b8b5
---
 uwb/uwb_calibration.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk
index 6c6b410..d0585d9 100644
--- a/uwb/uwb_calibration.mk
+++ b/uwb/uwb_calibration.mk
@@ -19,4 +19,3 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration.conf \
     $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-unknown.conf \
     $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-default.conf \
-    vendor/qorvo/uwb/aosp/init.uwb.calib.xtal.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.uwb.calib.sh \

From 6c363973fcb04d664d180aa00f650546bf386ca4 Mon Sep 17 00:00:00 2001
From: shawnlin <shawnlin@google.com>
Date: Tue, 15 Feb 2022 13:40:37 +0800
Subject: [PATCH 3/5] Add no cutout overlay packages for raven & oriole

Bug: 217772613
Test: make
Change-Id: I097081fa87a87f034725f44599f9e575b8e00a80
---
 device-oriole.mk | 4 ++++
 device-raven.mk  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/device-oriole.mk b/device-oriole.mk
index c38708a..12dc717 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -181,6 +181,10 @@ endif
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.build.svn=24
 
+# Set support hide display cutout feature
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.support_hide_display_cutout=true
+
 # Hide cutout overlays
 PRODUCT_PACKAGES += \
     NoCutoutOverlay \
diff --git a/device-raven.mk b/device-raven.mk
index a8bd9d4..3d1aaa2 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -194,6 +194,10 @@ endif
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.build.svn=24
 
+# Set support hide display cutout feature
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.support_hide_display_cutout=true
+
 # Hide cutout overlays
 PRODUCT_PACKAGES += \
     NoCutoutOverlay \

From cd290ec3291f3f078083529de6574bc94480c8ea Mon Sep 17 00:00:00 2001
From: Wei Wang <wvw@google.com>
Date: Tue, 15 Feb 2022 18:55:49 -0800
Subject: [PATCH 4/5] Do not initialize restricted cpuset during boot.

Bug: 219518509
Bug: 217481359
Test: Build
Signed-off-by: Wei Wang <wvw@google.com>
Change-Id: I4f62c118fe9280cadb85f6fde75016c109b1b3f9
---
 powerhint-oriole.json | 2 +-
 powerhint-raven.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index 8f1bcb4..a3b6d99 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -196,7 +196,7 @@
         "0-3",
         "0-7"
       ],
-      "ResetOnInit": true
+      "ResetOnInit": false
     },
     {
       "Name": "CDHighCpusetCpus",
diff --git a/powerhint-raven.json b/powerhint-raven.json
index 0e1eb32..19c6469 100644
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -197,7 +197,7 @@
         "0-3",
         "0-7"
       ],
-      "ResetOnInit": true
+      "ResetOnInit": false
     },
     {
       "Name": "CDHighCpusetCpus",

From 5d41f2aaa9dca0dc56782d84181c2d1a3f7d268e Mon Sep 17 00:00:00 2001
From: SianyiHuang <sianyihuang@google.com>
Date: Tue, 28 Dec 2021 21:02:41 +0800
Subject: [PATCH 5/5] Config: fine tune the ambient threshold to improve the
 brightness stability

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

diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index cf57ec0..d93eb1f 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -311,4 +311,73 @@
 
     <!-- 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/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index 491a4cc..cffd560 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -284,4 +284,73 @@
 
     <!-- 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>