From 3cb185e4a1fb511322980b8331feab70973b61b7 Mon Sep 17 00:00:00 2001 From: Oli Lan Date: Thu, 6 Feb 2020 11:55:51 +0000 Subject: [PATCH] Observe new apexd status value of "activated" as required. As of aosp/1224611, there is a new step in the preparation of APEXes where init calls back into apexd after DE user data is unencrypted to allow DE apex data to be snapshotted or restored. aosp/1228581 introduces a new apexd.status value of "activated" that is set once APEXes are activated but before this snapshot has occurred. init may execute "perform_apex_config" once this has occurred, so this CL changes init to wait for "activated" rather than "ready" before doing this. Bug: 148672144 Test: build & flash, check boot completes and check in logs that init waits on the correct status value. Change-Id: I339580bf593d3b09a5dff749ac2a5d1952bcb210 --- rootdir/init.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootdir/init.rc b/rootdir/init.rc index 5fbad75dd..666cd5697 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -728,7 +728,7 @@ on post-fs-data mkdir /data/incremental 0771 system system encryption=Require # Wait for apexd to finish activating APEXes before starting more processes. - wait_for_prop apexd.status ready + wait_for_prop apexd.status activated perform_apex_config # Special-case /data/media/obb per b/64566063 @@ -743,7 +743,7 @@ on post-fs-data # 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. + # completed and apexd.status becomes "ready". exec_start apexd-snapshotde # Set SELinux security contexts on upgrade or policy update.