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

Commit 1016c8a7 authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Automerger Merge Worker
Browse files

Return empty suffix for invalid slots am: a6759d5d am: 2dba4ac8 am: 284508d0 

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



Change-Id: Ide60989030be2c342a334b2b6d1f3b08f09d5e6c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fa594366 284508d0

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();

}