Merge "Don\'t start defaultcrypto twice" into nyc-dev am: 0264d8f
am: e72c338
* commit 'e72c33872e2105ca1e63ba4f891ac68a6330dffa':
Don't start defaultcrypto twice
Change-Id: Ibad904c5df684b03b80771a6a90c6a1ee49e073f
gugelfrei
commit
85dfdb082d
@ -1,13 +1,12 @@
|
||||
# One shot invocation to deal with encrypted volume.
|
||||
service defaultcrypto /system/bin/vdc --wait cryptfs mountdefaultencrypted
|
||||
disabled
|
||||
oneshot
|
||||
on defaultcrypto
|
||||
exec - root -- /system/bin/vdc --wait cryptfs mountdefaultencrypted
|
||||
# vold will set vold.decrypt to trigger_restart_framework (default
|
||||
# encryption) or trigger_restart_min_framework (other encryption)
|
||||
|
||||
# One shot invocation to encrypt unencrypted volumes
|
||||
service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default noui
|
||||
disabled
|
||||
oneshot
|
||||
on encrypt
|
||||
start surfaceflinger
|
||||
exec - root -- /system/bin/vdc --wait cryptfs enablecrypto inplace default noui
|
||||
# vold will set vold.decrypt to trigger_restart_framework (default
|
||||
# encryption)
|
||||
|
Loading…
Reference in new issue