commit 242130f3f8180baef35649f350ca737d0b0c6ae3
author Tri Vo <trong@google.com> Tue Jun 18 15:33:01 2019 -0700
committer Tri Vo <trong@google.com> Tue Jun 18 15:34:12 2019 -0700
tree bb61e5296a90fe48edefa4c85e5833017d6e18db
parent 6c704f736c7cbf4fed12f97381ec978ea3b7ceb9

vold: use RAII wake locks

Prevents wake lock leaks, e.g. b/133175847

Bug: 133175847
Test: boot blueline
Change-Id: I62fd1c6c3abbfd35aebe11343abd717a7cf4eef7

Benchmark.cpp

diff --git a/Benchmark.cpp b/Benchmark.cpp
index b0a3b85..9548956 100644
--- a/Benchmark.cpp
+++ b/Benchmark.cpp
@@ -181,7 +181,7 @@
 void Benchmark(const std::string& path,
                const android::sp<android::os::IVoldTaskListener>& listener) {
     std::lock_guard<std::mutex> lock(kBenchmarkLock);
-    acquire_wake_lock(PARTIAL_WAKE_LOCK, kWakeLock);
+    android::power::WakeLock wl{kWakeLock};
 
     PerformanceBoost boost;
     android::os::PersistableBundle extras;
@@ -190,8 +190,6 @@
     if (listener) {
         listener->onFinished(res, extras);
     }
-
-    release_wake_lock(kWakeLock);
 }
 
 }  // namespace vold