ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "KillZramBackingDevice: Return immediately if backing_dev is none." am: 7e2d32bc06

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1710548

Change-Id: I6afe6758f30d4ee63e85cf56fe2a6f3962b2f090
This commit is contained in:
David Anderson 2021-05-26 04:01:49 +00:00 • committed by Automerger Merge Worker
commit 4c21150d8d
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
init/reboot.cpp
View file

@ -478,6 +478,11 @@ static Result<void> KillZramBackingDevice() {
// 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...";