Merge "Resume-on-Reboot: Citadel implementation" into rvc-dev am: b68…

…526b Original change: https://googleplex-android-review.googlesource.com/c/device/google/bonito/+/11695164 Change-Id: I75c366504aabd938abc4687009bd191d042a296a
AnierinBliss · Jun 9, 2020 · 26435ff · 26435ff
2 parents 3661b05 + b68526b
commit 26435ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/device.mk b/device.mk
@@ -143,7 +143,7 @@ PRODUCT_PACKAGES += \
 
 # Resume on Reboot support
 PRODUCT_PACKAGES += \
-    android.hardware.rebootescrow-service.default
+    android.hardware.rebootescrow-service.citadel
 
 # Use Sdcardfs
 PRODUCT_PRODUCT_PROPERTIES += \

diff --git a/init.hardware.rc b/init.hardware.rc
@@ -238,6 +238,10 @@ on post-fs-data
     # Setup folder for modem fdr
     mkdir /data/vendor/modem_fdr 0700 root system
 
+    # Resume-on-Reboot after we have the data dir and keymaster
+    mkdir /data/vendor/rebootescrow 0770 hsm hsm
+    start vendor.rebootescrow-citadel
+
     # keep that at the end of on post-fs-data
     # Set indication (checked by vold) that we have finished this action
     setprop vold.post_fs_data_done 1