From 828d7df843f525ffe9aab7374b30062cb3edd7a0 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Wed, 14 Aug 2019 13:51:47 +0800 Subject: [PATCH] disable citadel and file encryption Bug: 139478768 Change-Id: Ie702b12cbcc48ff2aa5b352970b9be9bdec1732c --- device.mk | 4 ++-- fstab.hardware | 2 +- init.hardware.rc | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/device.mk b/device.mk index 93b9cca..c450ef3 100644 --- a/device.mk +++ b/device.mk @@ -601,7 +601,7 @@ PRODUCT_PACKAGES += \ android.hardware.dumpstate@1.0-service.redfin # Citadel -PRODUCT_PACKAGES += \ +#PRODUCT_PACKAGES += \ citadeld \ citadel_updater \ android.hardware.authsecret@1.0-service.citadel \ @@ -611,7 +611,7 @@ PRODUCT_PACKAGES += \ wait_for_strongbox # Citadel debug stuff -PRODUCT_PACKAGES_DEBUG += \ +#PRODUCT_PACKAGES_DEBUG += \ test_citadel # Storage: for factory reset protection feature diff --git a/fstab.hardware b/fstab.hardware index d2762bb..f111269 100644 --- a/fstab.hardware +++ b/fstab.hardware @@ -5,6 +5,6 @@ /dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard,sync wait,formattable,first_stage_mount /dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=0,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect /dev/block/bootdevice/by-name/misc /misc emmc defaults defaults -/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier latemount,wait,check,quota,formattable,fileencryption=ice,reservedsize=128M,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,keydirectory=/metadata/vold/metadata_encryption,checkpoint=fs +/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier latemount,wait,check,quota,formattable,reservedsize=128M,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,checkpoint=fs /devices/platform/soc/a600000.ssusb/a600000.dwc3* auto vfat defaults voldmanaged=usb:auto /dev/block/zram0 none swap defaults zramsize=2147483648,max_comp_streams=8,zram_loopback_path=/data/unencrypted/zram_swap,zram_loopback_size=512M diff --git a/init.hardware.rc b/init.hardware.rc index 449c277..05f7690 100644 --- a/init.hardware.rc +++ b/init.hardware.rc @@ -60,8 +60,8 @@ on init && property:vendor.skip.init=0 start vendor.qseecomd start keymaster-4-0 - start vendor.citadeld - start vendor.keymaster-4-0-citadel + #start vendor.citadeld + #start vendor.keymaster-4-0-citadel # Support legacy paths symlink /sdcard /mnt/sdcard @@ -164,12 +164,12 @@ on post-fs on late-fs # Start services for bootanim - start color_init - wait_for_prop vendor.display.native_display_primaries_ready 1 - setprop ro.surface_flinger.display_primary_red ${vendor.display.primary_red} - setprop ro.surface_flinger.display_primary_green ${vendor.display.primary_green} - setprop ro.surface_flinger.display_primary_blue ${vendor.display.primary_blue} - setprop ro.surface_flinger.display_primary_white ${vendor.display.primary_white} + #start color_init + #wait_for_prop vendor.display.native_display_primaries_ready 1 + #setprop ro.surface_flinger.display_primary_red ${vendor.display.primary_red} + #setprop ro.surface_flinger.display_primary_green ${vendor.display.primary_green} + #setprop ro.surface_flinger.display_primary_blue ${vendor.display.primary_blue} + #setprop ro.surface_flinger.display_primary_white ${vendor.display.primary_white} start surfaceflinger start bootanim start vendor.hwcomposer-2-3 @@ -177,7 +177,7 @@ on late-fs start vendor.qti.hardware.display.allocator # Wait for keymaster HALs (TEE and StrongBox) - exec_start wait_for_strongbox + #exec_start wait_for_strongbox # Mount RW partitions which need run fsck