From fb381564deb2e712a97f01d137753f84e8b3f8f1 Mon Sep 17 00:00:00 2001
From: Cody Northrop <cnorthrop@google.com>
Date: Mon, 27 Feb 2023 10:34:02 -0700
Subject: [PATCH 1/2] EGL: Configure multifile cache

Test: Boot (quickly)
Test: pubg_mobile_launch ANGLE trace
Test: /data/nativetest64/EGL_test/EGL_test
Test: /data/nativetest64/libEGL_test/libEGL_test
Bug: b/266725576
Change-Id: I2a2429c6d46193711893e3e2dd7aa25cab82ed4c
---
 device.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/device.mk b/device.mk
index 0c629033..57eaf645 100644
--- a/device.mk
+++ b/device.mk
@@ -226,6 +226,11 @@ PRODUCT_VENDOR_PROPERTIES += \
 	ro.hardware.egl = mali
 endif
 
+# Configure EGL blobcache
+PRODUCT_VENDOR_PROPERTIES += \
+       ro.egl.blobcache.multifile=true \
+       ro.egl.blobcache.multifile_limit=134217728 \
+
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.opengles.version=196610 \
 	graphics.gpu.profiler.support=true \

From 19bfe732fa5555672408cb3c1d20f153df3a6042 Mon Sep 17 00:00:00 2001
From: Kai Shi <kaishi@google.com>
Date: Thu, 23 Feb 2023 11:10:47 -0800
Subject: [PATCH 2/2] Enable country code update during setup wizard

Bug: 267944733
Test: manual with various network
Change-Id: Ia987c07fd5866a2ff64798c180daf1f62cfa2648
---
 rro_overlays/WifiOverlay/res/values/config.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 2b878db1..ab512efa 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -148,4 +148,9 @@
     <!-- Boolean indicating whether DTIM multiplier configuration is enabled. DTIM multiplier value
         is when the system is in the suspended mode -->
     <bool translatable="false" name="config_wifiDtimMultiplierConfigEnabled">true</bool>
+
+    <!-- Boolean indicating whether the framework updates country from scan results when there is
+         no telephony country code and driver country code is 00.
+         This is applied only during the setup wizard -->
+    <bool translatable="false" name ="config_wifiUpdateCountryCodeFromScanResultSetupWizard">true</bool>
 </resources>