diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-31 18:50:56 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-31 18:50:56 +0000 |
commit | 5f6d2907483bcd42d399d1dbd836c2f7054f2a4b (patch) | |
tree | 90aacb633d142c11c6922b13965018a37799de0e | |
parent | f9af4f88729401306a3d8a411872badf638e3bbb (diff) | |
parent | ed84c02f8cffa49b95bbbc7eb5052dc5d3f4b933 (diff) | |
download | hikey-android13-d2-release.tar.gz |
Snap for 8389696 from ed84c02f8cffa49b95bbbc7eb5052dc5d3f4b933 to tm-d2-releaseandroid-13.0.0_r55android13-d2-release
Change-Id: I76c624ce513d6fb1bd2fb70d6001f02821bc406f
-rw-r--r-- | device-common.mk | 3 | ||||
-rw-r--r-- | hikey960/fstab.hikey960 | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/device-common.mk b/device-common.mk index 33d28c18..0e498f46 100644 --- a/device-common.mk +++ b/device-common.mk @@ -91,8 +91,7 @@ PRODUCT_PROPERTY_OVERRIDES += wifi.interface=wlan0 \ PRODUCT_RUNTIMES := runtime_libart_default # Build default bluetooth a2dp and usb audio HALs -PRODUCT_PACKAGES += audio.a2dp.default \ - audio.bluetooth.default \ +PRODUCT_PACKAGES += audio.bluetooth.default \ audio.usb.default \ audio.r_submix.default \ tinyplay diff --git a/hikey960/fstab.hikey960 b/hikey960/fstab.hikey960 index 09356a7a..ae250da1 100644 --- a/hikey960/fstab.hikey960 +++ b/hikey960/fstab.hikey960 @@ -6,7 +6,7 @@ #/dev/block/platform/soc/ff3b0000.ufs/by-name/system_a /system ext4 ro wait #/dev/block/platform/soc/ff3b0000.ufs/by-name/cache /cache ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait #/dev/block/platform/soc/ff3b0000.ufs/by-name/userdata /data ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait -/dev/block/by-name/userdata /data ext4 discard,noatime,nosuid,nodev,noauto_da_alloc,data=ordered,user_xattr,barrier=1,inlinecrypt latemount,wait,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,keydirectory=/metadata/vold/metadata_encryption,quota +/dev/block/by-name/userdata /data ext4 discard,noatime,nosuid,nodev,noauto_da_alloc,data=ordered,user_xattr,barrier=1 latemount,wait,formattable,fileencryption=aes-256-xts,keydirectory=/metadata/vold/metadata_encryption,quota /dev/block/by-name/cache /metadata ext4 noatime,nosuid,nodev,discard wait,formattable,first_stage_mount,check /devices/platform/soc/ff37f000.dwmmc1/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata /devices/platform/soc/ff200000.hisi_usb/ff100000.dwc3/xhci-hcd.*.auto/usb* auto auto defaults voldmanaged=usbdisk:auto,encryptable=userdata |