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

Merge "Missing UpdateState::Cancelled string conversions" am: 962e3ddfd6

Browse source 
Change-Id: I679ee467be42ae1955992ff5f664cff8071d5d5b
This commit is contained in:
Automerger Merge Worker 2020-02-03 20:17:43 +00:00
commit da06572d74
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs_mgr/libsnapshot/snapshot.cpp
View file

@ -1709,6 +1709,8 @@ static UpdateState UpdateStateFromString(const std::string& contents) {
return UpdateState::MergeNeedsReboot;
} else if (contents == "merge-failed") {
return UpdateState::MergeFailed;
} else if (contents == "cancelled") {
return UpdateState::Cancelled;
} else {
LOG(ERROR) << "Unknown merge state in update state file: \"" << contents << "\"";
return UpdateState::None;
@ -1731,6 +1733,8 @@ std::ostream& operator<<(std::ostream& os, UpdateState state) {
return os << "merge-needs-reboot";
case UpdateState::MergeFailed:
return os << "merge-failed";
case UpdateState::Cancelled:
return os << "cancelled";
default:
LOG(ERROR) << "Unknown update state: " << static_cast<uint32_t>(state);
return os;