From 7ace69f2ed180aae3076ed27610f686f4afe4515 Mon Sep 17 00:00:00 2001
From: eddielan <eddielan@google.com>
Date: Mon, 29 Aug 2022 13:18:17 +0800
Subject: [PATCH 1/3] fingerprint: 1540.app take priority over cast_auth.app

Bug: 243902555
Test: Forrest build pass
Test: Flash on local device and unlock device via fingerprint
Change-Id: Ib64be209369c9778a27e32351ebd5e89e130a357
---
 conf/init.tangorpro.rc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/init.tangorpro.rc b/conf/init.tangorpro.rc
index e019927..8091436 100644
--- a/conf/init.tangorpro.rc
+++ b/conf/init.tangorpro.rc
@@ -73,6 +73,8 @@ on post-fs-data
     chown system system /sys/devices/platform/odm/odm:fp_fpc1020/hw_reset
     chown system system /sys/devices/platform/odm/odm:fp_fpc1020/irq
     chown system system /sys/devices/platform/odm/odm:fp_fpc1020/wakeup_enable
+
+on fs
     exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/1540.app
 
 # Castauth

From 06b486dec4de7ffd1398d973a72eadaad9ccf6b0 Mon Sep 17 00:00:00 2001
From: Ching-Sung Li <chriscsli@google.com>
Date: Fri, 9 Sep 2022 10:08:39 +0800
Subject: [PATCH 2/3] Build T6 Pro default CMF color wallpaper

Bug: 239505748
Test: Build pass; manual
Change-Id: Id7346c9f60321b24599d0e5124c800b5d88753f5
---
 device-tangorpro.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 0d0dc69..63540cf 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -24,6 +24,7 @@ $(call inherit-product-if-exists, vendor/google_devices/tangorpro/prebuilts/devi
 $(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/tangorpro/proprietary/tangorpro/device-vendor-tangorpro.mk)
+$(call inherit-product-if-exists, vendor/google_devices/tangorpro/proprietary/WallpapersTangorpro.mk)
 
 DEVICE_PACKAGE_OVERLAYS += device/google/tangorpro/tangorpro/overlay
 PRODUCT_SOONG_NAMESPACES += device/google/tangorpro

From 54bda0f2d359ea434466ca98614743b8a686bb87 Mon Sep 17 00:00:00 2001
From: Richard Chang <richardycc@google.com>
Date: Fri, 16 Sep 2022 08:20:38 +0000
Subject: [PATCH 3/3] powerhint: clean up unused hints in T6p

LAUNCH_120FPS is removed but some actions still use it.

Bug: 246738037
Test: pts-tradefed run commandAndExit pts -m PtsPerformanceTestCases -t
com.google.android.perf.pts.PowerHintJsonVerifyTest

Change-Id: I3ab91cace52c617adf0ccadb95098de697efc5c0
---
 powerhint.json | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/powerhint.json b/powerhint.json
index 8e51948..aae1c32 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -525,11 +525,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "Value": "LAUNCH_120FPS"
-    },
     {
       "PowerHint": "LAUNCH",
       "Type": "DoHint",
@@ -1291,11 +1286,6 @@
       "Duration": 0,
       "Value": "63"
     },
-    {
-      "PowerHint": "REFRESH_60FPS",
-      "Type": "MaskHint",
-      "Value": "LAUNCH_120FPS"
-    },
     {
       "PowerHint": "ADPF_DISABLE_TA_BOOST",
       "Node": "TAUClampBoost",