Snap for 10453563 from d2cf58d94e5cea7dbbcde0dfa8b00be526f41493 to mainline-permission-releaseaml_per_341711000aml_per_341614000aml_per_341510010aml_per_341410020aml_per_341311000aml_per_341110020aml_per_341110010aml_per_341011100aml_per_341011020aml_per_340916010android14-mainline-permission-release

Change-Id: I1d8baafbc552f2fc0ca057e53fcbad7a8a366df8

14 files changed, 183 insertions, 28 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 5eb91d2..6a637d3 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -61,8 +61,9 @@ endif
 
 BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432
 BOARD_DTBOIMG_PARTITION_SIZE := 8388608 # 8 MiB
-BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE ?= ext4
-BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := $(TARGET_RO_FILE_SYSTEM_TYPE)
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := $(TARGET_RO_FILE_SYSTEM_TYPE)
+TARGET_USERIMAGES_SPARSE_EROFS_DISABLED ?= true
 ifneq ($(TARGET_USE_AB_SLOT), true)
 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
diff --git a/binaries/bt-wifi-firmware/BCM4356A2.hcd b/binaries/bt-wifi-firmware/BCM4356A2.hcd
new file mode 100644
index 0000000..dc991ea
--- /dev/null
+++ b/binaries/bt-wifi-firmware/BCM4356A2.hcd
diff --git a/binaries/bt-wifi-firmware/fw_bcm4356a2_ag.bin b/binaries/bt-wifi-firmware/fw_bcm4356a2_ag.bin
new file mode 100755
index 0000000..99adcf9
--- /dev/null
+++ b/binaries/bt-wifi-firmware/fw_bcm4356a2_ag.bin
diff --git a/binaries/bt-wifi-firmware/nvram_ap6356.txt b/binaries/bt-wifi-firmware/nvram_ap6356.txt
new file mode 100644
index 0000000..6c6a5e8
--- /dev/null
+++ b/binaries/bt-wifi-firmware/nvram_ap6356.txt
@@ -0,0 +1,126 @@
+#AP6356S_NVRAM_V1.3_20180508
+#Modified from AP6356SDP_V1.0_NVRAM_20150216
+NVRAMRev=$Rev: 373428 $
+sromrev=11
+boardrev=0x1121
+boardtype=0x073e
+boardflags=0x02400201
+boardflags2=0x00802000
+boardflags3=0x0000010a
+macaddr=00:90:4c:1a:10:01
+ccode=0x5855
+regrev=1
+antswitch=0
+pdgain5g=4
+pdgain2g=4
+tworangetssi2g=0
+tworangetssi5g=0
+paprdis=0
+femctrl=10
+vendid=0x14e4
+devid=0x43a3
+manfid=0x2d0
+nocrc=1
+otpimagesize=502
+xtalfreq=37400
+rxgains2gelnagaina0=0
+rxgains2gtrisoa0=7
+rxgains2gtrelnabypa0=0
+rxgains5gelnagaina0=0
+rxgains5gtrisoa0=11
+rxgains5gtrelnabypa0=0
+rxgains5gmelnagaina0=0
+rxgains5gmtrisoa0=13
+rxgains5gmtrelnabypa0=0
+rxgains5ghelnagaina0=0
+rxgains5ghtrisoa0=12
+rxgains5ghtrelnabypa0=0
+rxgains2gelnagaina1=0
+rxgains2gtrisoa1=7
+rxgains2gtrelnabypa1=0
+rxgains5gelnagaina1=0
+rxgains5gtrisoa1=10
+rxgains5gtrelnabypa1=0
+rxgains5gmelnagaina1=0
+rxgains5gmtrisoa1=11
+rxgains5gmtrelnabypa1=0
+rxgains5ghelnagaina1=0
+rxgains5ghtrisoa1=11
+rxgains5ghtrelnabypa1=0
+rxchain=3
+txchain=3
+aa2g=3
+aa5g=3
+agbg0=2
+agbg1=2
+aga0=2
+aga1=2
+tssipos2g=1
+extpagain2g=2
+tssipos5g=1
+extpagain5g=2
+tempthresh=255
+tempoffset=255
+rawtempsense=0x1ff
+pa2ga0=-135,5769,-647
+pa2ga1=-143,6023,-677
+pa5ga0=-183,5746,-697,-172,5801,-685,-176,5707,-680,-180,5445,-659
+pa5ga1=-186,5543,-669,-193,5506,-675,-210,5282,-661,-199,5367,-665
+subband5gver=0x4
+pdoffsetcckma0=0x4
+pdoffsetcckma1=0x4
+pdoffset40ma0=0x0000
+pdoffset80ma0=0x0000
+pdoffset40ma1=0x0000
+pdoffset80ma1=0x0000
+maxp2ga0=72
+maxp5ga0=69,70,69,68
+maxp2ga1=71
+maxp5ga1=67,67,67,67
+cckbw202gpo=0x1222
+cckbw20ul2gpo=0x0000
+mcsbw202gpo=0x9E644422
+mcsbw402gpo=0xE9744424
+dot11agofdmhrbw202gpo=0x4444
+ofdmlrbw202gpo=0x0022
+mcsbw205glpo=0xEEA86661
+mcsbw405glpo=0xEEB86663
+mcsbw805glpo=0xEEB86663
+mcsbw205gmpo=0xAAA86663
+mcsbw405gmpo=0xECB86663
+mcsbw805gmpo=0xEEA86663
+mcsbw205ghpo=0xCC986663
+mcsbw405ghpo=0xEEA86663
+mcsbw805ghpo=0xEEA86663
+mcslr5glpo=0x0000
+mcslr5gmpo=0x0000
+mcslr5ghpo=0x0000
+sb20in40hrpo=0x0
+sb20in80and160hr5glpo=0x0
+sb40and80hr5glpo=0x0
+sb20in80and160hr5gmpo=0x0
+sb40and80hr5gmpo=0x0
+sb20in80and160hr5ghpo=0x0
+sb40and80hr5ghpo=0x0
+sb20in40lrpo=0x0
+sb20in80and160lr5glpo=0x0
+sb40and80lr5glpo=0x0
+sb20in80and160lr5gmpo=0x0
+sb40and80lr5gmpo=0x0
+sb20in80and160lr5ghpo=0x0
+sb40and80lr5ghpo=0x0
+dot11agduphrpo=0x0
+dot11agduplrpo=0x0
+phycal_tempdelta=255
+temps_period=15
+temps_hysteresis=15
+rssicorrnorm_c0=4,4
+rssicorrnorm_c1=4,4
+rssicorrnorm5g_c0=1,2,3,1,2,3,6,6,8,6,6,8
+rssicorrnorm5g_c1=1,2,3,2,2,2,7,7,8,7,7,8
+muxenab=0x10
+swctrlmap_2g=0x00001141,0x00004212,0x00001040,0x211212,0x0ff
+swctrlmap_5g=0x00000202,0x00000101,0x00000202,0x000000,0x047
+swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x003
+swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x003
+btc_params33=5
diff --git a/bootloader/README b/bootloader/README
index 14d04f6..b0cac36 100644
--- a/bootloader/README
+++ b/bootloader/README
@@ -1,25 +1,25 @@
 Build Mainline u-boot - bl33:
 =============================
 
-Main Wiki Page : https://gitlab.com/baylibre/amlogic/atv/u-boot/wikis/home
+Main Wiki Page : https://gitlab.baylibre.com/baylibre/amlogic/atv/u-boot/wikis/home
 
 Download the toolchain : gcc-linaro-7.2.1-2017.11-x86_64_aarch64-elf
         http://releases.linaro.org/components/toolchain/binaries/7.2-2017.11/aarch64-elf/gcc-linaro-7.2.1-2017.11-x86_64_aarch64-elf.tar.xz
 
 Download U-Boot Source Code From :
-        https://gitlab.com/baylibre/amlogic/atv/u-boot.git
+        https://gitlab.baylibre.com/baylibre/amlogic/atv/u-boot.git
 
 actual tag :  u-boot/v2021.07/integ-20210712
 dev branch :  u-boot/v2021.07/integ
 
 link to U-Boot aosp release wiki page :
-https://gitlab.com/baylibre/amlogic/atv/u-boot/wikis/U-Boot-for-Yukawa-Release
+https://gitlab.baylibre.com/baylibre/amlogic/atv/u-boot/wikis/U-Boot-for-Yukawa-Release
 
 Compile:
 
         export PATH=<path-to-toolchain>/gcc-linaro-7.2.1-2017.11-x86_64_aarch64-elf/bin:$PATH
         export CROSS_COMPILE=aarch64-elf-
-        git clone https://gitlab.com/baylibre/amlogic/atv/u-boot.git
+        git clone https://gitlab.baylibre.com/baylibre/amlogic/atv/u-boot.git
         cd u-boot
         git checkout u-boot/v2021.07/integ-20210712
         make [sei510|sei610|sei610_ab|khadas-vim3_android|khadas-vim3_android_ab|khadas-vim3l_android|khadas-vim3l_android_ab]_defconfig
@@ -55,7 +55,7 @@ after reboot if partitions table need to be updated:
         fastboot oem format
 
 More informations to update and flash bootloader on Yukawa:
-https://gitlab.com/baylibre/amlogic/atv/u-boot/wikis/U-Boot-for-Yukawa
+https://gitlab.baylibre.com/baylibre/amlogic/atv/u-boot/wikis/U-Boot-for-Yukawa
 
 
 Generate new fip_packages for Khadas VIM3/3L
diff --git a/device-common.mk b/device-common.mk
index 6a2132e..6e429b4 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -22,6 +22,8 @@ ifeq ($(TARGET_USE_TABLET_LAUNCHER), true)
 # Setup tablet build
 $(call inherit-product, frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
+# Packages to invoke RC pairing
+PRODUCT_PACKAGES += YukawaService YukawaAndroidOverlay
 else
 # Setup TV Build
 USE_OEM_TV_APP := true
@@ -73,6 +75,9 @@ PRODUCT_PACKAGES += \
     bootctrl.yukawa
 endif
 
+# System RO FS Type
+TARGET_RO_FILE_SYSTEM_TYPE ?= ext4
+
 # Dynamic partitions
 PRODUCT_BUILD_SUPER_PARTITION := true
 PRODUCT_USE_DYNAMIC_PARTITIONS := true
@@ -122,10 +127,17 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf
 
 # BT and Wifi FW
+ifeq ($(TARGET_ADT3), true)
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/binaries/bt-wifi-firmware/BCM4356A2.hcd:$(TARGET_COPY_OUT_VENDOR)/firmware/brcm/BCM4356A2.hcd \
+    $(LOCAL_PATH)/binaries/bt-wifi-firmware/fw_bcm4356a2_ag.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/brcm/fw_bcm4356a2_ag.bin \
+    $(LOCAL_PATH)/binaries/bt-wifi-firmware/nvram_ap6356.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/brcm/nvram.txt
+else
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/binaries/bt-wifi-firmware/BCM.hcd:$(TARGET_COPY_OUT_VENDOR)/firmware/brcm/BCM4359C0.hcd \
     $(LOCAL_PATH)/binaries/bt-wifi-firmware/fw_bcm4359c0_ag.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/brcm/fw_bcm4359c0_ag.bin \
     $(LOCAL_PATH)/binaries/bt-wifi-firmware/nvram_ap6359.txt:$(TARGET_COPY_OUT_VENDOR)/firmware/brcm/nvram.txt
+endif
 
 ifeq ($(TARGET_USE_TABLET_LAUNCHER), true)
 # Use Launcher3QuickStep
@@ -244,6 +256,7 @@ PRODUCT_PACKAGES += \
     hdmi_cec.yukawa
 
 PRODUCT_PROPERTY_OVERRIDES += ro.hdmi.device_type=4 \
+    ro.hdmi.cec_device_types=playback_device \
     persist.sys.hdmi.keep_awake=false
 
 PRODUCT_COPY_FILES += \
@@ -365,11 +378,10 @@ PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml
 
 # Enable BT Pairing with button BTN_0 (key 256)
-PRODUCT_PACKAGES += YukawaService YukawaAndroidOverlay
+
 PRODUCT_COPY_FILES += \
     device/amlogic/yukawa/input/Vendor_0001_Product_0001.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Vendor_0001_Product_0001.kl
 
-
 # Light HAL
 PRODUCT_PACKAGES += \
     android.hardware.light-service \
diff --git a/fstab.ramdisk.common b/fstab.ramdisk.common
index 5f6e84e..def6026 100644
--- a/fstab.ramdisk.common
+++ b/fstab.ramdisk.common
@@ -1,2 +1,4 @@
+system		/system		erofs	ro				wait,logical,first_stage_mount
 system		/system		ext4	noatime,ro,errors=panic		wait,logical,first_stage_mount
+vendor		/vendor		erofs	ro				wait,logical,first_stage_mount
 vendor		/vendor		ext4	noatime,ro,errors=panic		wait,logical,first_stage_mount
diff --git a/fstab.ramdisk.common.avb b/fstab.ramdisk.common.avb
index 9123f63..bee8400 100644
--- a/fstab.ramdisk.common.avb
+++ b/fstab.ramdisk.common.avb
@@ -1,2 +1,4 @@
+system		/system		erofs	ro				wait,avb=vbmeta,logical,first_stage_mount
 system		/system		ext4	noatime,ro,errors=panic		wait,avb=vbmeta,logical,first_stage_mount
+vendor		/vendor		erofs	ro				wait,avb,logical,first_stage_mount
 vendor		/vendor		ext4	noatime,ro,errors=panic		wait,avb,logical,first_stage_mount
diff --git a/fstab.recovery.yukawa b/fstab.recovery.yukawa
index a5af82c..2a4ac45 100644
--- a/fstab.recovery.yukawa
+++ b/fstab.recovery.yukawa
@@ -1,8 +1,10 @@
+system		/system		erofs	ro				wait,logical,first_stage_mount
 system		/system		ext4	noatime,ro,errors=panic		wait,logical,first_stage_mount
+vendor		/vendor		erofs	ro				wait,logical,first_stage_mount
 vendor		/vendor		ext4	noatime,ro,errors=panic		wait,logical,first_stage_mount
-/dev/block/platform/soc/ffe07000.mmc/by-name/userdata       /data               f2fs      noatime,nosuid,nodev    latemount,wait,check,quota,fileencryption=software,quota
-/dev/block/platform/soc/ffe07000.mmc/by-name/userdata       /data               ext4      noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    latemount,wait,check,quota,formattable,reservedsize=32M
-/dev/block/platform/soc/ffe07000.mmc/by-name/cache      /cache              ext4      noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    latemount,wait,check,formattable
-/dev/block/platform/soc/ffe07000.mmc/by-name/misc         /misc           emmc    defaults           defaults
+/dev/block/platform/soc/ffe07000.mmc/by-name/userdata     /data           f2fs    noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065      latemount,wait,check,fileencryption=software,quota,formattable,fscompress,readahead_size_kb=128
+/dev/block/platform/soc/ffe07000.mmc/by-name/userdata     /data           ext4    noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    latemount,wait,check,quota,formattable,reservedsize=32M
+/dev/block/platform/soc/ffe07000.mmc/by-name/cache        /cache          ext4    noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    latemount,wait,check,formattable
+/dev/block/platform/soc/ffe07000.mmc/by-name/misc         /misc           emmc    defaults                defaults
 /dev/block/platform/soc/ffe07000.mmc/by-name/recovery     /recovery       emmc    defaults                defaults
 /dev/block/platform/soc/ffe07000.mmc/by-name/boot         /boot           emmc    defaults                defaults
\ No newline at end of file
diff --git a/fstab.recovery.yukawa.avb b/fstab.recovery.yukawa.avb
index a758697..0341e2b 100644
--- a/fstab.recovery.yukawa.avb
+++ b/fstab.recovery.yukawa.avb
@@ -1,8 +1,10 @@
+system		/system		erofs	ro				wait,avb=vbmeta,logical,first_stage_mount
 system		/system		ext4	noatime,ro,errors=panic		wait,avb=vbmeta,logical,first_stage_mount
+vendor		/vendor		erofs	ro				wait,avb,logical,first_stage_mount
 vendor		/vendor		ext4	noatime,ro,errors=panic		wait,avb,logical,first_stage_mount
-/dev/block/platform/soc/ffe07000.mmc/by-name/userdata       /data               f2fs      noatime,nosuid,nodev    latemount,wait,check,quota,fileencryption=software,quota
-/dev/block/platform/soc/ffe07000.mmc/by-name/userdata       /data               ext4      noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    latemount,wait,check,quota,formattable,reservedsize=32M
-/dev/block/platform/soc/ffe07000.mmc/by-name/cache      /cache              ext4      noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    latemount,wait,check,formattable
+/dev/block/platform/soc/ffe07000.mmc/by-name/userdata     /data           f2fs    noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065      latemount,wait,check,fileencryption=software,quota,formattable,fscompress,readahead_size_kb=128
+/dev/block/platform/soc/ffe07000.mmc/by-name/userdata     /data           ext4    noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    latemount,wait,check,quota,formattable,reservedsize=32M
+/dev/block/platform/soc/ffe07000.mmc/by-name/cache        /cache          ext4    noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic    latemount,wait,check,formattable
 /dev/block/platform/soc/ffe07000.mmc/by-name/misc         /misc           emmc    defaults           defaults
 /dev/block/platform/soc/ffe07000.mmc/by-name/recovery     /recovery       emmc    defaults                defaults
 /dev/block/platform/soc/ffe07000.mmc/by-name/boot         /boot           emmc    defaults                defaults
\ No newline at end of file
diff --git a/fstab.yukawa b/fstab.yukawa
index 169a376..748cf11 100644
--- a/fstab.yukawa
+++ b/fstab.yukawa
@@ -1,9 +1,11 @@
-/dev/block/platform/soc/ffe07000.mmc/by-name/userdata   /data           f2fs    noatime,nosuid,nodev                                            latemount,wait,check,quota,fileencryption=software,quota
+/dev/block/platform/soc/ffe07000.mmc/by-name/userdata   /data           f2fs    noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065     latemount,wait,check,fileencryption=software,quota,formattable,fscompress,readahead_size_kb=128
 /dev/block/platform/soc/ffe07000.mmc/by-name/userdata   /data           ext4    noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic   latemount,wait,check,quota,formattable,reservedsize=32M
 /dev/block/platform/soc/ffe07000.mmc/by-name/cache      /cache          ext4    noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic   latemount,wait,check,formattable
 /dev/block/platform/soc/ffe07000.mmc/by-name/misc       /misc           emmc    defaults                                                        defaults
+system                                                  /system         erofs   ro                                                              wait,logical,first_stage_mount
 system                                                  /system         ext4    ro,barrier=1                                                    wait,logical,first_stage_mount
+vendor                                                  /vendor         erofs   ro                                                              wait,logical,first_stage_mount
 vendor                                                  /vendor         ext4    ro,barrier=1                                                    wait,logical,first_stage_mount
-*/block/mmcblk0						auto            auto    defaults                                                        voldmanaged=sdcard1:auto,encryptable=userdata
+*/block/mmcblk0                                         auto            auto    defaults                                                        voldmanaged=sdcard1:auto,encryptable=userdata
 */block/sd*                                             auto            auto    defaults                                                        voldmanaged=usb:auto,noemulatedsd
 /dev/block/zram0                                        none            swap    defaults                                                        zramsize=268435456
diff --git a/fstab.yukawa.ab b/fstab.yukawa.ab
index e48fb5c..35f9734 100644
--- a/fstab.yukawa.ab
+++ b/fstab.yukawa.ab
@@ -1,7 +1,9 @@
+system				/system		erofs	ro								wait,slotselect,logical,first_stage_mount
 system				/system		ext4	noatime,ro,errors=panic						wait,slotselect,logical,first_stage_mount
+vendor				/vendor		erofs	ro								wait,slotselect,logical,first_stage_mount
 vendor				/vendor		ext4	noatime,ro,errors=panic						wait,slotselect,logical,first_stage_mount
-/dev/block/by-name/userdata	/data		f2fs	noatime,nosuid,nodev						latemount,wait,check,quota,fileencryption=software,quota
-/dev/block//by-name/userdata	/data		ext4	noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic	latemount,wait,check,quota,formattable,reservedsize=32M
+/dev/block/by-name/userdata	/data		f2fs	noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065	latemount,wait,check,fileencryption=software,quota,formattable,fscompress,readahead_size_kb=128
+/dev/block/by-name/userdata	/data		ext4	noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic	latemount,wait,check,quota,formattable,reservedsize=32M
 /dev/block/by-name/misc		/misc		emmc	defaults							defaults
 */block/mmcblk0			auto		auto	defaults							voldmanaged=sdcard1:auto,encryptable=userdata
 */block/sd*			auto		auto	defaults							voldmanaged=usb:auto,noemulatedsd
diff --git a/fstab.yukawa.avb.ab b/fstab.yukawa.avb.ab
index cc6b618..f6d8439 100644
--- a/fstab.yukawa.avb.ab
+++ b/fstab.yukawa.avb.ab
@@ -1,7 +1,9 @@
+system				/system		erofs	ro								wait,slotselect,avb=vbmeta,logical,first_stage_mount
 system				/system		ext4	noatime,ro,errors=panic						wait,slotselect,avb=vbmeta,logical,first_stage_mount
+vendor				/vendor		erofs	ro								wait,slotselect,avb,logical,first_stage_mount
 vendor				/vendor		ext4	noatime,ro,errors=panic						wait,slotselect,avb,logical,first_stage_mount
-/dev/block/by-name/userdata	/data		f2fs	noatime,nosuid,nodev						latemount,wait,check,quota,fileencryption=software,quota
-/dev/block//by-name/userdata	/data		ext4	noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic	latemount,wait,check,quota,formattable,reservedsize=32M
+/dev/block/by-name/userdata	/data		f2fs	noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065	latemount,wait,check,fileencryption=software,quota,formattable,fscompress,readahead_size_kb=128
+/dev/block/by-name/userdata	/data		ext4	noatime,nosuid,nodev,nodelalloc,nomblk_io_submit,errors=panic	latemount,wait,check,quota,formattable,reservedsize=32M
 /dev/block/by-name/misc		/misc		emmc	defaults							defaults
 */block/mmcblk0			auto		auto	defaults							voldmanaged=sdcard1:auto,encryptable=userdata
 */block/sd*			auto		auto	defaults							voldmanaged=usb:auto,noemulatedsd
diff --git a/init.yukawa.rc b/init.yukawa.rc
index 6a26f4f..f3affbd 100644
--- a/init.yukawa.rc
+++ b/init.yukawa.rc
@@ -26,14 +26,16 @@ on zygote-start
     mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi
 
 service wpa_supplicant /system/vendor/bin/hw/wpa_supplicant \
-     -g@android:wpa_wlan0
-     interface aidl android.hardware.wifi.supplicant.ISupplicant/default
-     socket wpa_wlan0 dgram 660 wifi wifi
-     class main
-     disabled
-     oneshot
+    -g@android:wpa_wlan0
+    interface aidl android.hardware.wifi.supplicant.ISupplicant/default
+    socket wpa_wlan0 dgram 660 wifi wifi
+    class main
+    user root
+    disabled
+    oneshot
 
 service bugreport /system/bin/dumpstate -d -p -z
     class main
+    user root
     disabled
     oneshot