Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "bootctl: check for nullptr" into main am: 5ee2652c7b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3315633

Change-Id: I63d7f1e56de1e05d7535777d5fdfe904ab24dadd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daniel Zheng
2024-10-23 17:34:36 +00:00
committed by Automerger Merge Worker
parent 8982698b20 5ee2652c7b
commit 746560704a
1 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
boot/aidl/client/BootControlClient.cpp
View File

@@ -37,6 +37,17 @@
using aidl::android::hardware::boot::MergeStatus;
#define TEST_OP(_x, _y, op) \
do { \
const auto& x = _x; \
const auto& y = _y; \
if (!(x op y)) { \
LOG(ERROR) << #_x " " #op " " #_y << " failed: " << x << " " #op " " << y; \
return {}; \
} \
} while (0)
#define TEST_NE(_x, _y) TEST_OP(_x, _y, !=)
std::ostream& operator<<(std::ostream& os, MergeStatus status) {
switch (status) {
case MergeStatus::NONE:
@@ -107,21 +118,36 @@ class BootControlClientAidl final : public BootControlClient {
int32_t GetNumSlots() const override {
int32_t ret = -1;
if (!module_) {
LOG(ERROR) << "bootctl module not set";
return ret;
}
LOG_NDK_STATUS(module_->getNumberSlots(&ret));
return ret;
}
int32_t GetCurrentSlot() const override {
int32_t ret = -1;
if (!module_) {
LOG(ERROR) << "bootctl module not set";
return ret;
}
LOG_NDK_STATUS(module_->getCurrentSlot(&ret));
return ret;
}
MergeStatus getSnapshotMergeStatus() const override {
MergeStatus status = MergeStatus::UNKNOWN;
if (!module_) {
LOG(ERROR) << "bootctl module not set";
return status;
}
LOG_NDK_STATUS(module_->getSnapshotMergeStatus(&status));
return status;
}
std::string GetSuffix(int32_t slot) const override {
TEST_NE(module_, nullptr);
std::string ret;
const auto status = module_->getSuffix(slot, &ret);
if (!status.isOk()) {
@@ -133,6 +159,7 @@ class BootControlClientAidl final : public BootControlClient {
}
std::optional<bool> IsSlotBootable(int32_t slot) const override {
TEST_NE(module_, nullptr);
bool ret = false;
const auto status = module_->isSlotBootable(slot, &ret);
if (!status.isOk()) {
@@ -144,6 +171,7 @@ class BootControlClientAidl final : public BootControlClient {
}
CommandResult MarkSlotUnbootable(int32_t slot) override {
TEST_NE(module_, nullptr);
const auto status = module_->setSlotAsUnbootable(slot);
if (!status.isOk()) {
LOG(ERROR) << __FUNCTION__ << "(" << slot << ")" << " failed "
@@ -153,6 +181,7 @@ class BootControlClientAidl final : public BootControlClient {
}
CommandResult SetActiveBootSlot(int slot) override {
TEST_NE(module_, nullptr);
const auto status = module_->setActiveBootSlot(slot);
if (!status.isOk()) {
LOG(ERROR) << __FUNCTION__ << "(" << slot << ")" << " failed "
@@ -160,14 +189,20 @@ class BootControlClientAidl final : public BootControlClient {
}
return {.success = status.isOk(), .errMsg = status.getDescription()};
}
int GetActiveBootSlot() const {
int ret = -1;
if (!module_) {
LOG(ERROR) << "bootctl module not set";
return ret;
}
LOG_NDK_STATUS(module_->getActiveBootSlot(&ret));
return ret;
}
// Check if |slot| is marked boot successfully.
std::optional<bool> IsSlotMarkedSuccessful(int slot) const override {
TEST_NE(module_, nullptr);
bool ret = false;
const auto status = module_->isSlotMarkedSuccessful(slot, &ret);
if (!status.isOk()) {
@@ -179,6 +214,7 @@ class BootControlClientAidl final : public BootControlClient {
}
CommandResult MarkBootSuccessful() override {
TEST_NE(module_, nullptr);
const auto status = module_->markBootSuccessful();
if (!status.isOk()) {
LOG(ERROR) << __FUNCTION__ << " failed " << status.getDescription();
@@ -188,6 +224,7 @@ class BootControlClientAidl final : public BootControlClient {
CommandResult SetSnapshotMergeStatus(
aidl::android::hardware::boot::MergeStatus merge_status) override {
TEST_NE(module_, nullptr);
const auto status = module_->setSnapshotMergeStatus(merge_status);
if (!status.isOk()) {
LOG(ERROR) << __FUNCTION__ << "(" << merge_status << ")" << " failed "