aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BoardConfigCommon.mk3
-rw-r--r--manifest.xml9
-rw-r--r--msm8996.mk4
-rw-r--r--rootdir/etc/fstab.qcom4
4 files changed, 2 insertions, 18 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 48d995c022e..8018243ff8b 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -111,9 +111,6 @@ BOARD_HEALTHD_CUSTOM_CHARGER_RES := $(PLATFORM_PATH)/charger/images
# Before enabling lineage charger you have to fix it!
WITH_LINEAGE_CHARGER := false
-# Crypto
-TARGET_HW_DISK_ENCRYPTION := true
-
# Display
TARGET_USES_ION := true
TARGET_USES_GRALLOC1 := true
diff --git a/manifest.xml b/manifest.xml
index 9498d88230b..1431d4cb9f3 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -385,15 +385,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</interface>
</hal>
<hal format="hidl">
- <name>vendor.qti.hardware.cryptfshw</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>ICryptfsHw</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>vendor.qti.hardware.data.latency</name>
<transport>hwbinder</transport>
<version>1.0</version>
diff --git a/msm8996.mk b/msm8996.mk
index 67fcb1aed24..57344c3539e 100644
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -164,10 +164,6 @@ PRODUCT_PACKAGES += \
android.hardware.ir@1.0-service.leeco_8996 \
ConsumerirTransmitter
-# CryptfsHW
-PRODUCT_PACKAGES += \
- vendor.qti.hardware.cryptfshw@1.0-service-qti.qsee
-
# Device settings
PRODUCT_PACKAGES += \
DeviceSettings
diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index f96ed8406cb..ec4e5053845 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -11,8 +11,8 @@
/dev/block/bootdevice/by-name/recovery /recovery emmc defaults defaults
/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait,recoveryonly
/dev/block/bootdevice/by-name/vendor /vendor ext4 ro,barrier=1 wait,recoveryonly
-/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,barrier=1,noauto_da_alloc wait,check,encryptable=footer,quota
-/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime wait,check,encryptable=footer,quota
+/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,noatime,barrier=1,noauto_da_alloc wait,check,quota
+/dev/block/bootdevice/by-name/userdata /data f2fs nosuid,nodev,noatime wait,check,quota
/dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait,check
/dev/block/bootdevice/by-name/cache /cache f2fs nosuid,nodev,noatime,inline_xattr,flush_merge,data_flush wait,check
/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 nosuid,nodev,no_sehash_xattr,barrier=1 wait