diff options
| author | James Hawkins <jhawkins@google.com> | 2016-03-04 19:30:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-03-04 19:30:56 +0000 |
| commit | c67ef7820f7375bdbdf4398abf82e4019543eef9 (patch) | |
| tree | ff7338971c4c8b9a00fcc0ec76f2c3e1cd3044a1 | |
| parent | f26207197eb8f6867eb192613d3a524db5a7f16a (diff) | |
| parent | 5e655f02c5e772447254d68a5b299a625399f3cb (diff) | |
| download | core-c67ef7820f7375bdbdf4398abf82e4019543eef9.tar.gz core-c67ef7820f7375bdbdf4398abf82e4019543eef9.tar.bz2 core-c67ef7820f7375bdbdf4398abf82e4019543eef9.zip | |
Merge "bootstat: Gate boot time metrics logging on an encrypted device being decrypted."
| -rw-r--r-- | bootstat/bootstat.rc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bootstat/bootstat.rc b/bootstat/bootstat.rc index 13ef27ea0..3c20fc826 100644 --- a/bootstat/bootstat.rc +++ b/bootstat/bootstat.rc @@ -3,10 +3,13 @@ on post-fs-data mkdir /data/misc/bootstat 0700 root root -# This marker, boot animation stopped, is considered the point at which the +# The first marker, boot animation stopped, is considered the point at which # the user may interact with the device, so it is a good proxy for the boot # complete signal. -on property:init.svc.bootanim=stopped +# +# The second marker ensures an encrypted device is decrypted before logging +# boot time data. +on property:init.svc.bootanim=stopped && property:vold.decrypt=trigger_restart_framework # Record boot_complete timing event. exec - root root -- /system/bin/bootstat -r boot_complete |