diff options
Diffstat (limited to 'updater')
| -rw-r--r-- | updater/install.cpp | 5 | ||||
| -rw-r--r-- | updater/updater.cpp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/updater/install.cpp b/updater/install.cpp index 857d7f1e0..888239c83 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -890,7 +890,10 @@ Value* RebootNowFn(const char* name, State* state, const std::vector<std::unique return StringValue(""); } - const std::string reboot_cmd = "reboot," + property; + std::string reboot_cmd = "reboot," + property; + if (android::base::GetBoolProperty("ro.boot.quiescent", false)) { + reboot_cmd += ",quiescent"; + } android::base::SetProperty(ANDROID_RB_PROPERTY, reboot_cmd); sleep(5); diff --git a/updater/updater.cpp b/updater/updater.cpp index 37e003e66..1be8b6040 100644 --- a/updater/updater.cpp +++ b/updater/updater.cpp @@ -89,7 +89,7 @@ int main(int argc, char** argv) { const char* package_filename = argv[3]; MemMapping map; - if (sysMapFile(package_filename, &map) != 0) { + if (!map.MapFile(package_filename)) { LOG(ERROR) << "failed to map package " << argv[3]; return 3; } @@ -215,7 +215,6 @@ int main(int argc, char** argv) { if (updater_info.package_zip) { CloseArchive(updater_info.package_zip); } - sysReleaseMap(&map); return 0; } |