From f1af595c4eb76056d3e8eefbb890c5d3253265c0 Mon Sep 17 00:00:00 2001
From: Burney Yu <bosyuyu@google.com>
Date: Tue, 16 Aug 2022 18:53:52 +0800
Subject: [PATCH 1/2] F10: update default brightness

update default brightness in kernel to match the brightness from bootloader.

Test: make dist -j 128
Bug: 234327433
Change-Id: Iadc96325addda2fa569a70bd7d6aa14e5c181ad2
---
 felix/overlay/frameworks/base/core/res/res/values/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/felix/overlay/frameworks/base/core/res/res/values/config.xml b/felix/overlay/frameworks/base/core/res/res/values/config.xml
index d0178aa..c10d1cd 100644
--- a/felix/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/felix/overlay/frameworks/base/core/res/res/values/config.xml
@@ -35,7 +35,7 @@
 
     <!-- Default screen brightness setting
          Must be in the range specified by minimum and maximum. -->
-    <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.17293233082</item>
+    <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.138</item>
 
     <!-- The default refresh rate. Pixel 6 manages this using the peak refresh rate setting, so set
          this value to 0 so it has no effect. -->

From 5d989780372ddd4d8f6f0e7e9e790d2ddb34441e Mon Sep 17 00:00:00 2001
From: Jimmy Chen <jimmycmchen@google.com>
Date: Wed, 24 Aug 2022 08:53:46 +0800
Subject: [PATCH 2/2] p2p: fix p2p configuration

The correct path should be under /data,
or it is not writable.

wpa_supplicant now support p2p overlay configuration, a unified
wpa_supplicant init entry can be used.

Bug: 238601241
Test: create a group and check this group is persisted
      after reboot
Change-Id: If34d3173bba6d3fe2296d3dd63b05d99221faf42
---
 conf/init.felix.rc                                       | 9 ---------
 wifi/BoardConfig-wifi.mk                                 | 5 +++--
 .../{p2p_supplicant.conf => p2p_supplicant_overlay.conf} | 0
 3 files changed, 3 insertions(+), 11 deletions(-)
 rename wifi/{p2p_supplicant.conf => p2p_supplicant_overlay.conf} (100%)

diff --git a/conf/init.felix.rc b/conf/init.felix.rc
index 056e8d3..348c43a 100644
--- a/conf/init.felix.rc
+++ b/conf/init.felix.rc
@@ -148,12 +148,3 @@ on post-fs-data
     setprop wifi.direct.interface p2p-dev-wlan0
     setprop wifi.aware.interface aware_nmi0
 
-service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-    -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1p2p_device=1 \
-    -m/vendor/etc/wifi/p2p_supplicant.conf \
-    -g@android:wpa_wlan0 -dd
-    interface aidl android.hardware.wifi.supplicant.ISupplicant/default
-    socket wpa_wlan0 dgram 660 wifi wifi
-    class main
-    disabled
-    oneshot
diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk
index 1b21c5f..ab7708c 100644
--- a/wifi/BoardConfig-wifi.mk
+++ b/wifi/BoardConfig-wifi.mk
@@ -30,8 +30,9 @@ WIFI_FEATURE_IMU_DETECTION := true
 WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true
 WIFI_FEATURE_HOSTAPD_11AX := true
 BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true
+WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
 
 PRODUCT_COPY_FILES += \
-    device/google/pantah/wifi/p2p_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant.conf \
-    device/google/pantah/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
+    device/google/felix/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
+    device/google/felix/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
 
diff --git a/wifi/p2p_supplicant.conf b/wifi/p2p_supplicant_overlay.conf
similarity index 100%
rename from wifi/p2p_supplicant.conf
rename to wifi/p2p_supplicant_overlay.conf