commit 912b36224f19952663ebd3edc2a69d9031662fd1
author Matthew Bentham <matthew.bentham@arm.com> Fri May 03 15:49:14 2019 +0100
committer Matteo Martincigh <matteo.martincigh@arm.com> Tue May 07 07:54:08 2019 +0000
tree b84bdf384a6a9866336cfe5db7a613a4fc96d03c
parent 856d1c9c9b0b1609282c4f797cbafefc6531240d

IVGCVSW-2911 Work towards compatibility with Q

Explicitly use HAL V1_0 Operand, OperandType, and IPreparedModelCallback

Change-Id: If6aa6e9dc1bd0b7673ec247ac3560e7f072ef699
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>

ArmnnDriverImpl.cpp

diff --git a/ArmnnDriverImpl.cpp b/ArmnnDriverImpl.cpp
index 40bd80a..cb77247 100644
--- a/ArmnnDriverImpl.cpp
+++ b/ArmnnDriverImpl.cpp
@@ -26,9 +26,9 @@
 namespace
 {
 
-void NotifyCallbackAndCheck(const sp<IPreparedModelCallback>& callback,
+void NotifyCallbackAndCheck(const sp<V1_0::IPreparedModelCallback>& callback,
                             ErrorStatus errorStatus,
-                            const sp<IPreparedModel>& preparedModelPtr)
+                            const sp<V1_0::IPreparedModel>& preparedModelPtr)
 {
     Return<void> returned = callback->notify(errorStatus, preparedModelPtr);
     // This check is required, if the callback fails and it isn't checked it will bring down the service
@@ -41,7 +41,7 @@
 
 Return<ErrorStatus> FailPrepareModel(ErrorStatus error,
                                      const string& message,
-                                     const sp<IPreparedModelCallback>& callback)
+                                     const sp<V1_0::IPreparedModelCallback>& callback)
 {
     ALOGW("ArmnnDriverImpl::prepareModel: %s", message.c_str());
     NotifyCallbackAndCheck(callback, error, nullptr);
@@ -107,7 +107,7 @@
         const armnn::IGpuAccTunedParametersPtr& clTunedParameters,
         const DriverOptions& options,
         const HalModel& model,
-        const sp<IPreparedModelCallback>& cb,
+        const sp<V1_0::IPreparedModelCallback>& cb,
         bool float32ToFloat16)
 {
     ALOGV("ArmnnDriverImpl::prepareModel()");