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

Commit a29f5cc5 authored by Michael Butler's avatar Michael Butler Committed by Automerger Merge Worker
Browse files

Merge "Handle case where NN AIDL callback is null in IDevice::prepareModel*"... 

Merge "Handle case where NN AIDL callback is null in IDevice::prepareModel*" into tm-dev am: 9265715f

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



Change-Id: I22e33ad34ef64ab4662adc74a0f2e00584982a42
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7eeb0410 9265715f

neuralnetworks/utils/adapter/aidl/src/Device.cpp

+15 −5
Original line number Diff line number Diff line
@@ -135,16 +135,26 @@ std::shared_ptr<PreparedModel> adaptPreparedModel(nn::SharedPreparedModel prepar 
    return ndk::SharedRefBase::make<PreparedModel>(std::move(preparedModel));

}



void notify(IPreparedModelCallback* callback, ErrorStatus status,

            const std::shared_ptr<IPreparedModel>& preparedModel) {

    if (callback != nullptr) {

        const auto ret = callback->notify(status, preparedModel);

        if (!ret.isOk()) {

            LOG(ERROR) << "IPreparedModelCallback::notify failed with " << ret.getDescription();

        }

    }

}



void notify(IPreparedModelCallback* callback, PrepareModelResult result) {

    if (!result.has_value()) {

        const auto& [message, status] = result.error();

        LOG(ERROR) << message;

        const auto aidlCode = utils::convert(status).value_or(ErrorStatus::GENERAL_FAILURE);

        callback->notify(aidlCode, nullptr);

        notify(callback, aidlCode, nullptr);

    } else {

        auto preparedModel = std::move(result).value();

        auto aidlPreparedModel = adaptPreparedModel(std::move(preparedModel));

        callback->notify(ErrorStatus::NONE, std::move(aidlPreparedModel));

        notify(callback, ErrorStatus::NONE, std::move(aidlPreparedModel));

    }

}
@@ -284,7 +294,7 @@ ndk::ScopedAStatus Device::prepareModel(const Model& model, ExecutionPreference 
    if (!result.has_value()) {

        const auto& [message, code] = result.error();

        const auto aidlCode = utils::convert(code).value_or(ErrorStatus::GENERAL_FAILURE);

        callback->notify(aidlCode, nullptr);

        notify(callback.get(), aidlCode, nullptr);

        return ndk::ScopedAStatus::fromServiceSpecificErrorWithMessage(

                static_cast<int32_t>(aidlCode), message.c_str());

    }
@@ -300,7 +310,7 @@ ndk::ScopedAStatus Device::prepareModelFromCache( 
    if (!result.has_value()) {

        const auto& [message, code] = result.error();

        const auto aidlCode = utils::convert(code).value_or(ErrorStatus::GENERAL_FAILURE);

        callback->notify(aidlCode, nullptr);

        notify(callback.get(), aidlCode, nullptr);

        return ndk::ScopedAStatus::fromServiceSpecificErrorWithMessage(

                static_cast<int32_t>(aidlCode), message.c_str());

    }
@@ -317,7 +327,7 @@ ndk::ScopedAStatus Device::prepareModelWithConfig( 
    if (!result.has_value()) {

        const auto& [message, code] = result.error();

        const auto aidlCode = utils::convert(code).value_or(ErrorStatus::GENERAL_FAILURE);

        callback->notify(aidlCode, nullptr);

        notify(callback.get(), aidlCode, nullptr);

        return ndk::ScopedAStatus::fromServiceSpecificErrorWithMessage(

                static_cast<int32_t>(aidlCode), message.c_str());

    }