diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-02-14 15:24:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-14 15:24:41 +0000 |
| commit | b6e3b3cea2c2606fcff0364d680335fc3433247b (patch) | |
| tree | 0ca00265b623af1bc09eaf543820602bd62a8b89 /rootdir | |
| parent | 0f18bb1fe04a6d087644957cea9b6dbd2c621203 (diff) | |
| parent | 13d5bb4badf59e22d9d983d104596da3ec4f2753 (diff) | |
| download | system_core-b6e3b3cea2c2606fcff0364d680335fc3433247b.zip system_core-b6e3b3cea2c2606fcff0364d680335fc3433247b.tar.gz system_core-b6e3b3cea2c2606fcff0364d680335fc3433247b.tar.bz2 | |
Merge "Mount default encrypted devices at boot"
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/init.rc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index 8239999..59190d8 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -391,11 +391,15 @@ on boot setprop net.tcp.buffersize.evdo 4094,87380,262144,4096,16384,262144 class_start core - class_start main on nonencrypted + class_start main class_start late_start +on property:vold.decrypt=trigger_default_encryption + start surfaceflinger + start defaultcrypto + on charger class_start charger @@ -529,6 +533,13 @@ service media /system/bin/mediaserver group audio camera inet net_bt net_bt_admin net_bw_acct drmrpc mediadrm ioprio rt 4 +# One shot invocation to deal with encrypted volume. +service defaultcrypto /system/bin/vdc --wait cryptfs mountdefaultencrypted + disabled + oneshot + # vold will set vold.decrypt to trigger_restart_framework (default + # encryption) or trigger_restart_min_framework (other encryption) + service bootanim /system/bin/bootanimation class main user graphics |