commit 1b085b37c8ebd6f0178b7132e47910f62c2e6751
author Michael Butler <butlermichael@google.com> Thu Oct 14 21:44:46 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 14 21:44:46 2021 +0000
tree 4a5c05a364b36f870c5ff2dffbf800393733a0d8
parent 37b659dfab15789b8d87f63f62ae5b15c15092d8
parent f3bd4751a3f1d2f11a71f63e13cfdd19d4343902

Merge "Handle error returned by IBurstContext::freeMemory" am: f3bd4751a3

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

Change-Id: I5d8b492e47db807a9d5bdf39e6cd62b605b17ab7

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] = {};