diff options
| author | Xusong Wang <xusongw@google.com> | 2022-02-09 19:30:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-09 19:30:53 +0000 |
| commit | aba49d051252dbb15f7f8ec07462cad0e5039019 (patch) | |
| tree | cd8ed182480430dd35935a799ec1889d9fc13ebc /neuralnetworks/aidl/utils/src/Device.cpp | |
| parent | 140822d32658edc273265fb97aab51fffc87eeae (diff) | |
| parent | cfa38380851c6e6117af9dad71e336794a496201 (diff) | |
Merge "Address ANAPIC review comments -- hal." am: 8b389e1123 am: 706652c817 am: cfa3838085
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1957303
Change-Id: I6e80eb6917a16e3df331e7fc1923ca6e15e04a7f
Diffstat (limited to 'neuralnetworks/aidl/utils/src/Device.cpp')
| -rw-r--r-- | neuralnetworks/aidl/utils/src/Device.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/neuralnetworks/aidl/utils/src/Device.cpp b/neuralnetworks/aidl/utils/src/Device.cpp index f3f4fdbba1..b64a40dcaa 100644 --- a/neuralnetworks/aidl/utils/src/Device.cpp +++ b/neuralnetworks/aidl/utils/src/Device.cpp @@ -229,7 +229,6 @@ nn::GeneralResult<nn::SharedPreparedModel> Device::prepareModel( const auto aidlDeadline = NN_TRY(convert(deadline)); auto aidlModelCache = NN_TRY(convert(modelCache)); auto aidlDataCache = NN_TRY(convert(dataCache)); - const auto aidlToken = NN_TRY(convert(token)); const auto cb = ndk::SharedRefBase::make<PreparedModelCallback>(kFeatureLevel); const auto scoped = kDeathHandler.protectCallback(cb.get()); @@ -240,12 +239,13 @@ nn::GeneralResult<nn::SharedPreparedModel> Device::prepareModel( const auto ret = kDevice->prepareModelWithConfig( aidlModel, {aidlPreference, aidlPriority, aidlDeadline, std::move(aidlModelCache), - std::move(aidlDataCache), aidlToken, std::move(aidlHints), + std::move(aidlDataCache), token, std::move(aidlHints), std::move(aidlExtensionPrefix)}, cb); HANDLE_ASTATUS(ret) << "prepareModel failed"; return cb->get(); } + const auto aidlToken = NN_TRY(convert(token)); const auto ret = kDevice->prepareModel(aidlModel, aidlPreference, aidlPriority, aidlDeadline, aidlModelCache, aidlDataCache, aidlToken, cb); HANDLE_ASTATUS(ret) << "prepareModel failed"; |