Change pre-recovery into two services

/system/bin/uncrypt needs to be triggered to prepare the OTA package
before rebooting into the recovery. Separate pre-recovery (uncrypt)
into two services: uncrypt that does the uncryption work and
pre-recovery that actually reboots the device into recovery.

Also create /cache/recovery on post-fs in case it doesn't exist.

Bug: 20012567
Bug: 20949086
Change-Id: If67fe1e9ee6279593d2788452febcd3f0fe714c2
This commit is contained in:
Tao Bao 2015-05-11 14:08:18 -07:00
parent 4652fc6f08
commit e48aed0f0a

View file

@ -197,9 +197,9 @@ on post-fs
# We restorecon /cache in case the cache partition has been reset.
restorecon_recursive /cache
# This may have been created by the recovery system with odd permissions
chown system cache /cache/recovery
chmod 0770 /cache/recovery
# Create /cache/recovery in case it's not there. It'll also fix the odd
# permissions if created by the recovery system.
mkdir /cache/recovery 0770 system cache
#change permissions on vmallocinfo so we can grab it from bugreports
chown root log /proc/vmallocinfo
@ -652,7 +652,12 @@ service mdnsd /system/bin/mdnsd
disabled
oneshot
service pre-recovery /system/bin/uncrypt
service uncrypt /system/bin/uncrypt
class main
disabled
oneshot
service pre-recovery /system/bin/uncrypt --reboot
class main
disabled
oneshot