commit a6cebbe851706c576c61ac0c6e0903a09088ff4c
author Michael Butler <butlermichael@google.com> Thu Oct 14 22:27:36 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 14 22:27:36 2021 +0000
tree 76328cac7699f7ef48e00fa280a345b19fa0e538
parent 8d5adc3cee7b8c8d15372bb2fb065187088286a2
parent 5f9917e6c098efbc7e0f5871596ec0bdefa8679e

Merge "Handle error returned by IBurstContext::freeMemory" am: f3bd4751a3 am: 1b085b37c8 am: 608210f72c am: 02d3a9485d am: 5f9917e6c0

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

Change-Id: I820e3d18f2a3f9d16062bfef4351b7d48cd368ab

neuralnetworks/1.2/utils/src/ExecutionBurstController.cpp

diff --git a/neuralnetworks/1.2/utils/src/ExecutionBurstController.cpp b/neuralnetworks/1.2/utils/src/ExecutionBurstController.cpp
index b4b6f68..8ce96c4 100644
--- a/neuralnetworks/1.2/utils/src/ExecutionBurstController.cpp
+++ b/neuralnetworks/1.2/utils/src/ExecutionBurstController.cpp
@@ -176,7 +176,10 @@
         std::lock_guard guard(mMutex);
         const int32_t slot = mMemoryIdToSlot.at(memory);
         if (mBurstContext) {
-            mBurstContext->freeMemory(slot);
+            const auto ret = mBurstContext->freeMemory(slot);
+            if (!ret.isOk()) {
+                LOG(ERROR) << "IBustContext::freeMemory failed: " << ret.description();
+            }
         }
         mMemoryIdToSlot.erase(memory);
         mMemoryCache[slot] = {};