commit e09202e4e1316763e43e54b01f3cd73c097c4241
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 03 18:03:55 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 03 18:03:55 2020 +0000
tree 75147711e5a8ba7dc2e8fb72fae3f760dcab22de
parent d99cb395d9047e84cb5f6b258d2a9642fae9d64d
parent 99de360f9ad9e9de57df30cbbee0c3b401d8c879

Merge "Allow apexd to snapshot and restore DE data." am: 0460f65f78

Change-Id: I5e33934de587c18d9ccdb0734c0ea1ca58d2016e

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 8612eb8..5f6d8de 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -738,6 +738,12 @@
 
     init_user0
 
+    # Allow apexd to snapshot and restore device encrypted apex data in the case
+    # of a rollback. This should be done immediately after DE_user data keys
+    # are loaded. APEXes should not access this data until this has been
+    # completed.
+    exec_start apexd-snapshotde
+
     # Set SELinux security contexts on upgrade or policy update.
     restorecon --recursive --skip-ce /data