From f3985dc52fa6bc7c41ac518231aadb5fa437fbda Mon Sep 17 00:00:00 2001
From: Leo Chen <yinchiuan@google.com>
Date: Thu, 23 May 2024 06:38:01 +0000
Subject: [PATCH 1/4] Update IDisplay to V12

Test: trigger test build
Bug: 309897479
Change-Id: I86b6117e10249165b6c2b8c534b86cd7f3549fb0
Signed-off-by: Leo Chen <yinchiuan@google.com>
---
 device_framework_matrix_product.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 12755762..772c5e5a 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -78,7 +78,7 @@
     </hal>
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>11-12</version>
+        <version>12</version>
         <interface>
             <name>IDisplay</name>
             <instance>default</instance>

From c3eec0f7de6f186af28773b64aa3a277a1c3548b Mon Sep 17 00:00:00 2001
From: chenkris <chenkris@google.com>
Date: Mon, 10 Jun 2024 17:25:22 +0000
Subject: [PATCH 2/4] gs201: build fingerprint dump

Bug: 346450599
Test: adb bugreport
Change-Id: I988649841bf915b9af12a1b628930dc0ee80f186
---
 device.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device.mk b/device.mk
index 637d49ac..8508d894 100644
--- a/device.mk
+++ b/device.mk
@@ -41,6 +41,7 @@ include device/google/gs-common/betterbug/betterbug.mk
 ifneq ($(filter cheetah felix panther, $(TARGET_PRODUCT)),)
   include device/google/gs-common/bcmbt/dump/dumplog.mk
 endif
+include device/google/gs-common/fingerprint/fingerprint.mk
 
 TARGET_BOARD_PLATFORM := gs201
 

From 724b28eebf7c11bddcf9af0ea5689cdc8b177b63 Mon Sep 17 00:00:00 2001
From: Jerry Huang <huangjerry@google.com>
Date: Wed, 12 Jun 2024 05:32:06 +0000
Subject: [PATCH 3/4] gs201: update c2.android.vp8.decoder performance point

Align performance point with the Pixel family of devices.

Bug: 343004271
Test: run cts -m MctsMediaDecoderTestCases
-t android.media.decoder.cts.VideoDecoderPerfTest
Change-Id: I06abe0d6d2387792a1492a4fd551549ca3bdfa49

Change-Id: Ib98ea9116e7280cd420502a2f1968e46faa26066
---
 media_codecs_performance_c2.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml
index f84e518a..78345dc1 100644
--- a/media_codecs_performance_c2.xml
+++ b/media_codecs_performance_c2.xml
@@ -145,7 +145,7 @@
             <Limit name="measured-frame-rate-320x180" range="847-1271" />
             <Limit name="measured-frame-rate-640x360" range="412-618" />
             <Limit name="measured-frame-rate-1280x720" range="119-178" />
-            <Limit name="measured-frame-rate-1920x1080" range="47-70" />
+            <Limit name="measured-frame-rate-1920x1080" range="28-55" />
         </MediaCodec>
         <MediaCodec name="c2.android.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
             <Limit name="measured-frame-rate-320x180" range="622-934" />

From 76de5fed8dbf841c9c04abed461dce17c985568e Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Tue, 16 Apr 2024 12:56:12 +0100
Subject: [PATCH 4/4] Reapply "Enable Secretkeeper HAL service on gs201"

(This reverts commit 9922a0fc1260, ag/26704327.)

This requires that prebuilts on `main` have been updated to include the
April updates to the Secretkeeper TA (which includes fixes needed to
cope with larger and more realistic DICE chains).  Relevant devices:
- pantah
- felix
- lynx
- tangorpro

Bug: 291228655
Bug: 306364873
Bug: 341708664
Test: VtsSecretkeeperTargetTest on cheetah
Flag: build.RELEASE_AVF_ENABLE_LLPVM_CHANGES
Change-Id: I251a14221915fa8b2aaf3f1611c8c9f698596552
---
 device.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index 8508d894..38add23a 100644
--- a/device.mk
+++ b/device.mk
@@ -83,6 +83,11 @@ PRODUCT_SOONG_NAMESPACES += \
 
 LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
 
+ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true)
+	# Set the environment variable to enable the Secretkeeper HAL service.
+	SECRETKEEPER_ENABLED := true
+endif
+
 # OEM Unlock reporting
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 	ro.oem_unlock_supported=1
@@ -256,7 +261,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_VENDOR_PROPERTIES += \
 	vendor.mali.platform.config=/vendor/etc/mali/platform.config \
 	vendor.mali.debug.config=/vendor/etc/mali/debug.config \
-      	vendor.mali.base_protected_max_core_count=1 \
+	vendor.mali.base_protected_max_core_count=1 \
 	vendor.mali.base_protected_tls_max=67108864 \
 	vendor.mali.platform_agt_frequency_khz=24576