Merge cherrypicks of [16184860, 16184861, 16184862] into sc-qpr1-d-release.android-12.0.0_r32android-12.0.0_r29android-12.0.0_r27android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-release

Change-Id: Ie22ae7ae4063e8b7de4d9419a6e16b9d7acd592a

4 files changed, 13 insertions, 11 deletions

diff --git a/fstab.yukawa b/fstab.yukawa
index ae270c8..202dcc8 100644
--- a/fstab.yukawa
+++ b/fstab.yukawa
@@ -1,9 +1,9 @@
-/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
-system                                                  /system         ext4    ro,barrier=1            wait,logical,first_stage_mount
-vendor                                                  /vendor         ext4    ro,barrier=1            wait,logical,first_stage_mount
-*/block/mmcblk*    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
+/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
+system                                                  /system         ext4    ro,barrier=1                                                    wait,logical,first_stage_mount
+vendor                                                  /vendor         ext4    ro,barrier=1                                                    wait,logical,first_stage_mount
+*/block/mmcblk[0-1]                                     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 dab466c..25b338f 100644
--- a/fstab.yukawa.ab
+++ b/fstab.yukawa.ab
@@ -3,6 +3,6 @@ vendor				/vendor		ext4	noatime,ro,errors=panic						wait,slotselect,logical,fir
 /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/misc		/misc		emmc	defaults							defaults
-*/block/mmcblk*			auto		auto	defaults							voldmanaged=sdcard1:auto,encryptable=userdata
+*/block/mmcblk[0-1]		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.avb.ab b/fstab.yukawa.avb.ab
index 319e915..7399af8 100644
--- a/fstab.yukawa.avb.ab
+++ b/fstab.yukawa.avb.ab
@@ -3,6 +3,6 @@ vendor				/vendor		ext4	noatime,ro,errors=panic						wait,slotselect,avb,logical
 /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/misc		/misc		emmc	defaults							defaults
-*/block/mmcblk*			auto		auto	defaults							voldmanaged=sdcard1:auto,encryptable=userdata
+*/block/mmcblk[0-1]		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/ueventd.rc b/ueventd.rc
index 7ab7fd1..3daabc8 100644
--- a/ueventd.rc
+++ b/ueventd.rc
@@ -11,6 +11,8 @@ subsystem usbmisc
 /dev/nanohub              0660   system     system
 /dev/nanohub_comms        0660   system     system
 
+/dev/bus/usb/*/*          0660   system     system
+
 /dev/video1               0660   system     camera
 /dev/video2               0660   system     camera
 /dev/video3               0660   system     camera