commit 26bc3e7a66a9ebac3917a6e913cebba5090bf719
author Pierre-Hugues Husson <phh@phh.me> Wed Aug 29 20:36:21 2018 +0200
committer Jon West <electrikjesus@gmail.com> Thu Aug 30 17:40:30 2018 -0400
tree b67491d614889aab3782f4d75f561c68268fb8a2
parent af30131fb305982f10f184d6f81beceee9f16af0

Fix FDE + MTK RIL fix

Conflicts:
	phh-on-boot.sh

Change-Id: I9458431072a0e3691c79a522321b4abaf96aeaa1

phh-on-boot.sh

diff --git a/phh-on-boot.sh b/phh-on-boot.sh
index 0fe95e3..83e7b6d 100644
--- a/phh-on-boot.sh
+++ b/phh-on-boot.sh
@@ -1,5 +1,7 @@
 #!/system/bin/sh
 
+[ "$(getprop vold.decrypt)" == "trigger_restart_min_framework" ] && exit 0
+
 if [ "$(getprop ro.vendor.product.device)" == "HWBKL" ];then
       phh-su -c 'mount -o remount,rw /system'
       phh-su -c 'pm uninstall --user 0 com.android.camera2'
@@ -11,7 +13,7 @@
 fi
 
 if [ -f /vendor/bin/mtkmal ];then
-    if [ "$(getprop persist.mtk_ims_support)" == 1 ];then
+    if [ "$(getprop persist.mtk_ims_support)" == 1 -o "$(getprop persist.mtk_epdg_support)" == 1 ];then
         setprop persist.mtk_ims_support 0
         setprop persist.mtk_epdg_support 0
         reboot