eva: rework decryption method

OpenKirin · Apr 2, 2017 · 31c883e · 31c883e
1 parent c1ec645
commit 31c883e
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 59 deletions.
diff --git a/Android.mk b/Android.mk
@@ -14,4 +14,8 @@
 # limitations under the License.
 #
 
+ifeq ($(TARGET_DEVICE), berlin)
+
 include $(call all-makefiles-under, $(call my-dir))
+
+endif
diff --git a/omni_eva.mk b/omni_eva.mk
@@ -25,8 +25,7 @@ $(call inherit-product, vendor/omni/config/common.mk)
 
 PRODUCT_PACKAGES += \
     charger_res_images \
-    charger \
-    tmp_timer
+    charger
 
 ADDITIONAL_DEFAULT_PROPERTIES += \
     ro.secure=0 \

diff --git a/recovery/root/init.rc b/recovery/root/init.rc
@@ -94,7 +94,7 @@ on late-init
     # Remove a file to wake up anything waiting for firmware
     trigger firmware_mounts_complete
 
-on property:ro.timer.finished=true
+on property:init.svc.volisnotd=stopped
     trigger early-boot
     trigger boot
 

diff --git a/recovery/root/init.recovery.hi3650.rc b/recovery/root/init.recovery.hi3650.rc
@@ -1,10 +1,13 @@
 import /init.recovery.hi3650.usb.rc
 
-on fs
+on init
     symlink /dev/block/platform/hi_mci.0 /dev/block/bootdevice
+
+on property:ro.board.platform=hi3650
     start teecd
+
+on fs
     start volisnotd
-    start tmp_timer
 
 service teecd /sbin/teecd
     user root
@@ -19,7 +22,17 @@ service volisnotd /sbin/volisnotd -m
     disabled
     seclabel u:r:tee:s0
 
-service tmp_timer /sbin/tmp_timer
-    oneshot
-    disabled
-    seclabel u:r:recovery:s0
+on property:vold.decrypt=trigger_shutdown_framework
+    class_reset server
+
+on property:vold.decrypt=trigger_load_persist_props
+    load_persist_props
+
+on property:vold.decrypt=trigger_post_fs_data
+    trigger post-fs-data
+
+on post-fs-data
+    trigger post-fs-data_hw
+
+on post-fs-data_hw
+    setprop vold.post_fs_data_done 1
diff --git a/tmp_timer/Android.mk b/tmp_timer/Android.mk
diff --git a/tmp_timer/tmp_timer.c b/tmp_timer/tmp_timer.c