From 20c67af4379f74691c301e4dd95b678059f3920c Mon Sep 17 00:00:00 2001
From: Sergey Volk <servolk@google.com>
Date: Wed, 13 Sep 2023 21:43:56 +0000
Subject: [PATCH 1/3] DO NOT MERGE displayport: Move sysprop for enabling DP to
 device level

Move sysprop for enabling DP to device level makefiles so DP
configuration can be controlled at a device level.

Test: manual (check /sys/module/exynos_drm/parameters/dp_enabled)
Bug: 300167292
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dbfd61757233989a4b75a7e99fbf85c60b06d634)
Merged-In: Ic2ee2bba8960fe0960ac8acf03eaa2ac4b9b74e6
Change-Id: Ic2ee2bba8960fe0960ac8acf03eaa2ac4b9b74e6
---
 device.mk | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/device.mk b/device.mk
index 84e7aab3..d222ebc0 100644
--- a/device.mk
+++ b/device.mk
@@ -195,14 +195,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
 	telephony.active_modems.max_count=2
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PROPERTY_OVERRIDES += \
-	persist.vendor.usb.displayport.enabled=1
-else
-PRODUCT_PROPERTY_OVERRIDES += \
-	persist.vendor.usb.displayport.enabled=0
-endif
-
 USE_LASSEN_OEMHOOK := true
 
 # Use for GRIL

From 1490d66c285b81f9a93441f3ed0bcf54492de80f Mon Sep 17 00:00:00 2001
From: David Kimmel <davidkimmel@google.com>
Date: Wed, 20 Sep 2023 19:36:06 +0000
Subject: [PATCH 2/3] Revert "Sched lib affinity and freq settings"

This reverts commit 253d3d48fa4fe07b4dc39a5133659c75a807275a.

Reason for revert: Scheduling while atomic b/301031609

Bug: 301031609
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b8332186715e9e9f54bd864992de28bd4306fc1e)
Merged-In: I8179a926315da55ede03653a1517f13f61f3fdeb
Change-Id: I8179a926315da55ede03653a1517f13f61f3fdeb
---
 conf/init.zuma.rc | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index d4aa490e..44871de5 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -596,11 +596,6 @@ on boot
     chown audioserver system /sys/devices/platform/17c50000.abox/0.abox_debug/calliope_iva
     chown audioserver system /sys/kernel/debug/abox/log-00
 
-    # Change sched lib affinity
-    write /proc/vendor_sched/sched_lib_name libunity.so
-    write /proc/vendor_sched/sched_lib_mask_in 0x100
-    write /proc/vendor_sched/sched_lib_mask_out 0x1f0
-
 # Permission for USB SELECT
     chown system system /sys/class/android_usb/android0/enable
     chmod 0660 /sys/class/android_usb/android0/enable

From e223cf13b842696d4a2bbdd4e7ea6b714c2b1a30 Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <jaegeuk@google.com>
Date: Thu, 26 Oct 2023 20:04:00 +0000
Subject: [PATCH 3/3] [conflict] DO NOT MERGE - Run fsck to resolve possible
 data corruption am: 19eb98145d

Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/25175376

Bug: 305658663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:707c8849e5e5511a8bf009b61a714cdd2fea811b)
Merged-In: Icc611e53d39734b7f6ce9c70ca601d61ec4d4e33
Change-Id: Icc611e53d39734b7f6ce9c70ca601d61ec4d4e33
---
 device-common.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/device-common.mk b/device-common.mk
index ece4678b..a97a76f4 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -47,6 +47,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Set the max page size to 4096 (b/300367402)
 PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 4096
 
+# Trigger fsck on upgrade (305658663)
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.preventative_fsck = 1
+
 # Indicate that the bootloader supports the MTE developer option switch
 # (MISC_MEMTAG_MODE_MEMTAG_ONCE), with the exception of _fullmte products that
 # force enable MTE.