diff --git a/IdleMaint.cpp b/IdleMaint.cpp
index 164986c..a2d0f91 100644
--- a/IdleMaint.cpp
+++ b/IdleMaint.cpp
@@ -145,7 +145,7 @@
 }
 
 void Trim(const android::sp<android::os::IVoldTaskListener>& listener) {
-    android::power::WakeLock wl{kWakeLock};
+    acquire_wake_lock(PARTIAL_WAKE_LOCK, kWakeLock);
 
     // Collect both fstab and vold volumes
     std::list<std::string> paths;
@@ -195,6 +195,7 @@
         listener->onFinished(0, extras);
     }
 
+    release_wake_lock(kWakeLock);
 }
 
 static bool waitForGc(const std::list<std::string>& paths) {
@@ -369,7 +370,7 @@
 
     LOG(DEBUG) << "idle maintenance started";
 
-    android::power::WakeLock wl{kWakeLock};
+    acquire_wake_lock(PARTIAL_WAKE_LOCK, kWakeLock);
 
     std::list<std::string> paths;
     addFromFstab(&paths, PathTypes::kBlkDevice);
@@ -399,11 +400,13 @@
 
     LOG(DEBUG) << "idle maintenance completed";
 
+    release_wake_lock(kWakeLock);
+
     return android::OK;
 }
 
 int AbortIdleMaint(const android::sp<android::os::IVoldTaskListener>& listener) {
-    android::power::WakeLock wl{kWakeLock};
+    acquire_wake_lock(PARTIAL_WAKE_LOCK, kWakeLock);
 
     std::unique_lock<std::mutex> lk(cv_m);
     if (idle_maint_stat != IdleMaintStats::kStopped) {
@@ -421,6 +424,8 @@
         listener->onFinished(0, extras);
     }
 
+    release_wake_lock(kWakeLock);
+
     LOG(DEBUG) << "idle maintenance stopped";
 
     return android::OK;
