From 91ba7f3c997272da222cea144d9abb5b288a289b Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <zhangkelvin@google.com>
Date: Mon, 29 Aug 2022 18:02:25 +0000
Subject: [PATCH 1/3] Enable io_uring in fastbootd for gs101

This feature was recently added, but guarded with a sysprop. Enable it
on gs101 first. Will enable it on other devices once it stablizes.

Bug: 31712568
Test: m updatepackage, then flash the image to device
Change-Id: Iaad9591d1a51c306839580d7eb9b4d3289a1b5af
---
 device.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/device.mk b/device.mk
index d9546987..2afc6f86 100644
--- a/device.mk
+++ b/device.mk
@@ -579,6 +579,10 @@ PRODUCT_PACKAGES += \
 $(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk)
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/compression_with_xor.mk)
+
+# Enable usage of io_uring in fastbootd
+PRODUCT_VENDOR_PROPERTIES += sys.usb.ffs.io_uring_enabled=true
+
 # Enforce generic ramdisk allow list
 $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)
 

From 78e92a8146cdc17b160fd13e47634f489937a7b2 Mon Sep 17 00:00:00 2001
From: Roger Fang <rogerfang@google.com>
Date: Tue, 23 Aug 2022 17:03:36 +0800
Subject: [PATCH 2/3] pixelstats: add ams_rate sysfs for ATOM of
 VendorAudioHardwareStatsReported

Bug: 239508478
Test: manually test passed

Signed-off-by: Roger Fang <rogerfang@google.com>
Change-Id: I33ef881cb6b48d7a53a4f0b61124a838cd16a189
---
 pixelstats/service.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index a41d0882..a1fe772b 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -53,7 +53,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
             UFS_ERR_PATH(dme_err_count),
             UFS_ERR_PATH(fatal_err_count),
             UFS_ERR_PATH(auto_hibern8_err_count)
-        }
+        },
+        .AmsRatePath = "/sys/devices/platform/audiometrics/ams_rate_read_once",
 };
 
 const struct UeventListener::UeventPaths ueventPaths = {

From 92f1b6c40a69bfae9234a1b936b08497da93e969 Mon Sep 17 00:00:00 2001
From: Sayanna Chandula <sayanna@google.com>
Date: Thu, 28 Jul 2022 16:34:26 -0700
Subject: [PATCH 3/3] Revert "thermal: enable warm_reset on thermal shutdown"

This reverts commit 8afd9f90c142a09faf570807ff9fc7aa03cb1430.

Bug: 235765192
Test: Build and boot on device
Signed-off-by: Sayanna Chandula <sayanna@google.com>
Change-Id: I3df68c0c4a415415cca91b072b995d424b378dd7
---
 device-common.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/device-common.mk b/device-common.mk
index d9522989..cc373466 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -47,7 +47,3 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # ZramWriteback
 -include hardware/google/pixel/mm/device_gki.mk
-
-# Set thermal warm reset
-PRODUCT_PRODUCT_PROPERTIES += \
-    ro.thermal_warmreset = true