commit 684554549d21b8ecb457cb494e608e07b9d20d1e
author Daeho Jeong <daehojeong@google.com> Thu May 19 01:35:59 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 19 01:35:59 2022 +0000
tree 45eba45345f423c3f3295de47fae7eff3f2f7dea
parent 814dbfb77c52fbe9738a261251a5d7c149e1d1e1
parent d7237292e32401685f5595b5e1222c3dce27fd4c

Merge "vold: fix the range of stopped state of idleMaint" am: 289bcb5305 am: d7237292e3

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2100921

Change-Id: I1e70ad65c055db304ccbd9f64c739e3c8830175f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

IdleMaint.cpp

diff --git a/IdleMaint.cpp b/IdleMaint.cpp
index 2bfe3d9..426be58 100644
--- a/IdleMaint.cpp
+++ b/IdleMaint.cpp
@@ -450,17 +450,17 @@
         stopGc(paths);
     }
 
+    if (!gc_aborted) {
+        Trim(nullptr);
+        runDevGc();
+    }
+
     lk.lock();
     idle_maint_stat = IdleMaintStats::kStopped;
     lk.unlock();
 
     cv_stop.notify_one();
 
-    if (!gc_aborted) {
-        Trim(nullptr);
-        runDevGc();
-    }
-
     if (listener) {
         android::os::PersistableBundle extras;
         listener->onFinished(0, extras);