vold: use RAII wake locks
Prevents wake lock leaks, e.g. b/133175847
Bug: 133175847
Test: boot blueline
Change-Id: I62fd1c6c3abbfd35aebe11343abd717a7cf4eef7
diff --git a/cryptfs.cpp b/cryptfs.cpp
index c5d0307..7d59b2d 100644
--- a/cryptfs.cpp
+++ b/cryptfs.cpp
@@ -2007,6 +2007,7 @@
off64_t previously_encrypted_upto = 0;
bool rebootEncryption = false;
bool onlyCreateHeader = false;
+ std::unique_ptr<android::power::WakeLock> wakeLock = nullptr;
if (get_crypt_ftr_and_key(&crypt_ftr) == 0) {
if (crypt_ftr.flags & CRYPT_ENCRYPTION_IN_PROGRESS) {
@@ -2073,7 +2074,7 @@
* wants to keep the screen on, it can grab a full wakelock.
*/
snprintf(lockid, sizeof(lockid), "enablecrypto%d", (int)getpid());
- acquire_wake_lock(PARTIAL_WAKE_LOCK, lockid);
+ wakeLock = std::make_unique<android::power::WakeLock>(lockid);
/* The init files are setup to stop the class main and late start when
* vold sets trigger_shutdown_framework.
@@ -2254,7 +2255,6 @@
/* default encryption - continue first boot sequence */
property_set("ro.crypto.state", "encrypted");
property_set("ro.crypto.type", "block");
- release_wake_lock(lockid);
if (rebootEncryption && crypt_ftr.crypt_type != CRYPT_TYPE_DEFAULT) {
// Bring up cryptkeeper that will check the password and set it
property_set("vold.decrypt", "trigger_shutdown_framework");
@@ -2291,7 +2291,6 @@
} else {
/* set property to trigger dialog */
property_set("vold.encrypt_progress", "error_partially_encrypted");
- release_wake_lock(lockid);
}
return -1;
}
@@ -2301,14 +2300,10 @@
* Set the property and return. Hope the framework can deal with it.
*/
property_set("vold.encrypt_progress", "error_reboot_failed");
- release_wake_lock(lockid);
return rc;
error_unencrypted:
property_set("vold.encrypt_progress", "error_not_encrypted");
- if (lockid[0]) {
- release_wake_lock(lockid);
- }
return -1;
error_shutting_down:
@@ -2323,9 +2318,6 @@
/* shouldn't get here */
property_set("vold.encrypt_progress", "error_shutting_down");
- if (lockid[0]) {
- release_wake_lock(lockid);
- }
return -1;
}