From eead637cec071f42eeee220909bffa8e9a887803 Mon Sep 17 00:00:00 2001
From: "Chung-Kai (Michael) Mei" <chungkai@google.com>
Date: Wed, 24 May 2023 05:28:34 +0000
Subject: [PATCH 1/2] Revert^3 "shusky: disable parallel module loading"

This reverts commit 04716d571187561a8bd0d02f0a8cf332dc8c4d05.

Reason for revert: Now we can enter fastbootd normally.

Test: shiba rebooted 1000 times without failure
Bug: 280112517
Change-Id: I92736b1e535468083b35058f83a91ad153b6c5c6
---
 husky/BoardConfig.mk      | 6 ++++++
 ripcurrent/BoardConfig.mk | 6 ++++++
 shiba/BoardConfig.mk      | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk
index 205ca79..a88a5c6 100644
--- a/husky/BoardConfig.mk
+++ b/husky/BoardConfig.mk
@@ -14,6 +14,12 @@
 # limitations under the License.
 #
 
+# Enable load module in parallel
+BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
+
+# The modules which need to be loaded in sequential
+BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
+
 TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := husky
 TARGET_SCREEN_DENSITY := 520
diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk
index 1b5c405..9950fca 100644
--- a/ripcurrent/BoardConfig.mk
+++ b/ripcurrent/BoardConfig.mk
@@ -14,6 +14,12 @@
 # limitations under the License.
 #
 
+# Enable load module in parallel
+BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
+
+# The modules which need to be loaded in sequential
+BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
+
 TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := ripcurrent
 TARGET_SCREEN_DENSITY := 440
diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk
index 2acc2a4..92ab17c 100644
--- a/shiba/BoardConfig.mk
+++ b/shiba/BoardConfig.mk
@@ -14,6 +14,12 @@
 # limitations under the License.
 #
 
+# Enable load module in parallel
+BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
+
+# The modules which need to be loaded in sequential
+BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
+
 TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := shiba
 TARGET_SCREEN_DENSITY := 420

From b296cf0de46c3937b0faa422d07abde1a677e553 Mon Sep 17 00:00:00 2001
From: lbill <lbill@google.com>
Date: Thu, 25 May 2023 16:58:45 +0000
Subject: [PATCH 2/2] Update display shape config for FHD+ display

Display resolution : 2400x1080
Density : 420

Test: Build and flash
Bug: 275288471
Change-Id: I4de699dbc9243d04370db42c6054f54a26ddb1ae
---
 .../frameworks/base/core/res/res/values/config.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/shiba/overlay/frameworks/base/core/res/res/values/config.xml b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
index a82e841..cdde654 100644
--- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
@@ -290,6 +290,20 @@
         @left
     </string>
 
+    <!-- A string config in svg path format for the main display shape.
+         (@see https://www.w3.org/TR/SVG/paths.html#PathData).
+
+         This config must be set unless:
+         1. {@link Configuration#isScreenRound} is true which means the display shape is circular
+            and the system will auto-generate a circular shape.
+         2. The display has no rounded corner and the system will auto-generate a rectangular shape.
+         (@see DisplayShape#createDefaultDisplayShape)
+
+         Note: If the display supports multiple resolutions, please define the path config based on
+         the highest resolution so that it can be scaled correctly in each resolution.
+    -->
+    <string name="config_mainDisplayShape" translatable="false">M 96.4985,0.08523 C 91.1348,0.36051 82.70432,1.62526 79.38136,2.33639 59.52531,6.58116 50.34989,10.96631 39.9404,18.20101 27.73281,26.68534 16.59688,39.8618 10.50012,52.78766 6.40513,61.46939 2.3679,75.03133 1.2197,83.76495 0.13826,91.99294 0.31461,92.13538 0.08515,96.33507 V 2307.6753 l 1.5912,11.4829 c 4.89079,22.9627 11.89155,37.013 25.5533,51.2879 13.94576,14.5714 29.80105,22.7951 53.74919,27.8786 l 11.50244,1.59 H 987.5185 l 11.5025,-1.59 c 23.9482,-5.0835 39.8034,-13.3072 53.7492,-27.8786 13.6616,-14.2749 20.6626,-28.3252 25.5532,-51.2879 l 1.5913,-11.4829 V 96.33507 c -0.2295,-4.19969 -0.053,-4.34213 -1.1346,-12.57012 -1.1482,-8.73362 -5.1854,-22.29556 -9.2804,-30.97729 C 1063.4029,39.8618 1052.267,26.68534 1040.0594,18.20101 1029.65,10.96631 1020.4745,6.58116 1000.6184,2.33639 997.2955,1.62526 988.865,0.36051 983.5013,0.08523 Z</string>
+
     <!-- Type of the udfps long press sensor. Empty if long press is not supported. -->
     <string name="config_dozeUdfpsLongPressSensorType" translatable="false">com.google.sensor.long_press</string>