commit 7e2d32bc06103182e58b992391dd8cb8b6806575
author David Anderson <dvander@google.com> Wed May 26 03:29:05 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 26 03:29:05 2021 +0000
tree 146cbf5d682a5a9ed0cf4b8ad18190ce4b33e799
parent 18a307beb47efd295eae17e2693554a9ab2884df
parent 423c4f1994bebd8b106251e64ac1fcc04ba2df17

Merge "KillZramBackingDevice: Return immediately if backing_dev is none."

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index ab0e48e..0e788e4 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -478,6 +478,11 @@
     // cut the last "\n"
     backing_dev.erase(backing_dev.length() - 1);
 
+    if (android::base::StartsWith(backing_dev, "none")) {
+        LOG(INFO) << "No zram backing device configured";
+        return {};
+    }
+
     // shutdown zram handle
     Timer swap_timer;
     LOG(INFO) << "swapoff() start...";