From 2b741a51c52b0ffe02c573d38854c166040d78d2 Mon Sep 17 00:00:00 2001
From: Martin Liu <liumartin@google.com>
Date: Wed, 29 Dec 2021 15:49:35 +0800
Subject: [PATCH 1/3] gs101: set readahead_size_kb=128 to vendor, product and
 system_ext

To avoid memory pressure

Bug: 181567573
Test: check readahead size
Signed-off-by: Martin Liu <liumartin@google.com>
Change-Id: I0ef6456a96ef923fe681112560d2f49c514ff529
---
 conf/fstab.gs101.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/fstab.gs101.in b/conf/fstab.gs101.in
index a88d1cc1..8b7a7e3b 100644
--- a/conf/fstab.gs101.in
+++ b/conf/fstab.gs101.in
@@ -5,9 +5,9 @@
 #
 #<src>                                                   <mnt_point>                 <type>  <mnt_flags and options>  <fs_mgr_flags>
 system                                                   /system                     ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
-system_ext                                               /system_ext                 ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
-product                                                  /product                    ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
-vendor                                                   /vendor                     ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount
+system_ext                                               /system_ext                 ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
+product                                                  /product                    ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
+vendor                                                   /vendor                     ext4    ro,barrier=1             wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128
 vendor_dlkm                                              /vendor_dlkm                ext4    ro,barrier=1             wait,slotselect,avb=vbmeta,logical,first_stage_mount
 /dev/block/platform/14700000.ufs/by-name/boot            /boot                       emmc    defaults                 slotselect,avb=boot,first_stage_mount
 /dev/block/platform/14700000.ufs/by-name/efs             /mnt/vendor/efs             ext4    defaults,noatime,rw      wait,check,formattable

From 5467fac0814eb7b6963845fb95acf883deed51cb Mon Sep 17 00:00:00 2001
From: Roger Liao <rogerliao@google.com>
Date: Wed, 29 Dec 2021 19:06:09 +0800
Subject: [PATCH 2/3] Scale the flexibility for camera flash/autofocus settings

Let clients determine the configuration of camera flash/autofocus
features.

Bug: b/211840489
Change-Id: Id52529ea8985c02a8a93ebea0dbd2f619cf0cca9
---
 device.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index dc47041b..f3dddbb9 100644
--- a/device.mk
+++ b/device.mk
@@ -571,8 +571,13 @@ PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \
 	frameworks/native/data/etc/android.hardware.usb.accessory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.accessory.xml
 
+# (See b/211840489)
+ifneq ($(DISABLE_CAMERA_FS_AF),true)
+PRODUCT_COPY_FILES += \
+	frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.flash-autofocus.xml
+endif
+
 PRODUCT_COPY_FILES += \
-	frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.flash-autofocus.xml \
 	frameworks/native/data/etc/android.hardware.camera.front.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.front.xml \
 	frameworks/native/data/etc/android.hardware.camera.concurrent.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.concurrent.xml \
 	frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml\

From 1f13ae3470655a8a45b003fe8fc520a70648df02 Mon Sep 17 00:00:00 2001
From: Chris Ye <lzye@google.com>
Date: Fri, 17 Dec 2021 19:33:53 +0000
Subject: [PATCH 3/3] Enable verbose logging on by default for userdebug build.

Enable verbose logging on by default for userdebug build, to show
verbose logging of Wifi framework.

Bug: 200196601
Test: atest FrameworksWifiTests
Change-Id: Ia484b3893f291023b9dbd507805941b9b59bbaa2
---
 rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 090df9e7..1a7681e3 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -135,4 +135,10 @@
 
     <!-- Indicate the driver doesn't support NL80211 Reg changed event -->
     <bool translatable="false" name="config_wifiDriverSupportedNl80211RegChangedEvent">false</bool>
+
+    <!-- Indicate whether the verbose logging is always on -->
+    <!-- 0: verbose logging controlled by user
+         1: verbose logging on by default for userdebug
+         2: verbose logging on by default for all builds -->
+    <integer translatable="false" name="config_wifiVerboseLoggingAlwaysOnLevel">1</integer>
 </resources>