Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6759d5d authored by Kelvin Zhang's avatar Kelvin Zhang
Browse files

Return empty suffix for invalid slots 

Old HIDL HAL returns empty suffix, we should maintain this behavior in
AIDL.

Test: bootctl get-suffix 9, make sure result is empty
Bug: 219966986
Change-Id: Ia01c6bda899f3c5e0cdd1007cb051f7558f2e911
parent 67bb5eb3

boot/aidl/default/BootControl.cpp

+5 −3
Original line number Diff line number Diff line
@@ -84,10 +84,12 @@ ScopedAStatus BootControl::getSnapshotMergeStatus(MergeStatus* _aidl_return) { 


ScopedAStatus BootControl::getSuffix(int32_t in_slot, std::string* _aidl_return) {

    if (!impl_.IsValidSlot(in_slot)) {

        return ScopedAStatus::fromServiceSpecificErrorWithMessage(

                INVALID_SLOT, (std::string("Invalid slot ") + std::to_string(in_slot)).c_str());

    }

        // Old HIDL hal returns empty string for invalid slots. We should maintain this behavior in

        // AIDL for compatibility.

        _aidl_return->clear();

    } else {

        *_aidl_return = impl_.GetSuffix(in_slot);

    }

    return ScopedAStatus::ok();

}