ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix flaky AVB test from late verity_update_state

Browse source 
CtsNativeVerifiedBootTestCases is currently flaky due to race conditions
between verity_update_state and the test running.

Moving the call to verity_update_state before zygote-start should fix
the test.

Bug: 253033920
Test: Boot Android and check that partitions.system.verified.hash_alg
    has a non-empty value
Signed-off-by: Nathan Huckleberry <nhuck@google.com>
Change-Id: I9d252b0b6d74ed784ec2ffe091de2db53c5f45ba
This commit is contained in:
Nathan Huckleberry 2022-10-21 00:45:05 +00:00
parent c052460659
commit 8f6fcd19af
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rootdir/init.rc
View file

@ -1037,6 +1037,9 @@ on post-fs-data
# Enable FUSE by default
setprop persist.sys.fuse true
# Update dm-verity state and set partition.*.verified properties.
verity_update_state
# It is recommended to put unnecessary data/ initialization from post-fs-data
# to start-zygote in device's init.rc to unblock zygote start.
on zygote-start && property:ro.crypto.state=unencrypted
@ -1175,9 +1178,6 @@ on boot
# Define default initial receive window size in segments.
setprop net.tcp_def_init_rwnd 60
# Update dm-verity state and set partition.*.verified properties.
verity_update_state
# Start standard binderized HAL daemons
class_start hal