commit 7f90296cce86d80704cd8b94d24d2ca27efb761f
author Jiyong Park <jiyong@google.com> Wed Jan 08 18:38:55 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 08 18:38:55 2025 -0800
tree b5138c9d492508986081896bee53365ede4c3219
parent c81f2e81a08901010d64b9a98def6e9e32c5e4c9
parent b2a64ccfe666c757e9f35fd1f92380367f1086e2

Merge "Fixed failure of clearing loopback device" into main

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index ef9db9f..d6e37f7 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -486,8 +486,7 @@
         return ErrnoError() << "Failed to read " << ZRAM_BACK_DEV;
     }
 
-    // cut the last "\n"
-    backing_dev.erase(backing_dev.length() - 1);
+    android::base::Trim(backing_dev);
 
     if (android::base::StartsWith(backing_dev, "none")) {
         LOG(INFO) << "No zram backing device configured";
@@ -508,6 +507,12 @@
                        << " failed";
     }
 
+    if (!android::base::ReadFileToString(ZRAM_BACK_DEV, &backing_dev)) {
+        return ErrnoError() << "Failed to read " << ZRAM_BACK_DEV;
+    }
+
+    android::base::Trim(backing_dev);
+
     if (!android::base::StartsWith(backing_dev, "/dev/block/loop")) {
         LOG(INFO) << backing_dev << " is not a loop device. Exiting early";
         return {};