Merge changes from topics "nnapi-loop-timeout", "nnapi-loop-timeout-hal"

* changes:
  Add setLoopTimeout CTS test
  Implement loop timeout in CpuExecutor
  Implement loop timeout in ExecutionPlan
  Incorporate loop timeout HAL changes
  Specify loop timeout result codes
  Add loop timeout API

1 files changed, 3 insertions, 1 deletions

diff --git a/nn/runtime/test/TestCompilationCaching.cpp b/nn/runtime/test/TestCompilationCaching.cpp
index b9e4985e2..dab33d9f7 100644
--- a/nn/runtime/test/TestCompilationCaching.cpp
+++ b/nn/runtime/test/TestCompilationCaching.cpp
@@ -108,6 +108,7 @@ class CachingDriver : public sample_driver::SampleDriver {
         }
         Return<V1_3::ErrorStatus> execute_1_3(const V1_3::Request&, MeasureTiming,
                                               const OptionalTimePoint&,
+                                              const OptionalTimeoutDuration&,
                                               const sp<V1_3::IExecutionCallback>&) override {
             return V1_3::ErrorStatus::DEVICE_UNAVAILABLE;
         }
@@ -118,6 +119,7 @@ class CachingDriver : public sample_driver::SampleDriver {
         }
         Return<void> executeSynchronously_1_3(const V1_3::Request&, MeasureTiming,
                                               const OptionalTimePoint&,
+                                              const OptionalTimeoutDuration&,
                                               executeSynchronously_1_3_cb cb) override {
             cb(V1_3::ErrorStatus::DEVICE_UNAVAILABLE, {}, kBadTiming);
             return Void();
@@ -131,7 +133,7 @@ class CachingDriver : public sample_driver::SampleDriver {
         }
         Return<void> executeFenced(const hal::Request&, const hidl_vec<hidl_handle>&, MeasureTiming,
                                    const OptionalTimePoint&, const OptionalTimeoutDuration&,
-                                   executeFenced_cb cb) {
+                                   const OptionalTimeoutDuration&, executeFenced_cb cb) {
             cb(ErrorStatus::DEVICE_UNAVAILABLE, hidl_handle(nullptr), nullptr);
             return Void();
         }