From 912b36224f19952663ebd3edc2a69d9031662fd1 Mon Sep 17 00:00:00 2001
From: Matthew Bentham <matthew.bentham@arm.com>
Date: Fri, 3 May 2019 15:49:14 +0100
Subject: 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 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'ArmnnDriverImpl.cpp')

diff --git a/ArmnnDriverImpl.cpp b/ArmnnDriverImpl.cpp
index 40bd80ab..cb772478 100644
--- a/ArmnnDriverImpl.cpp
+++ b/ArmnnDriverImpl.cpp
@@ -26,9 +26,9 @@ using namespace android::hardware;
 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 @@ void NotifyCallbackAndCheck(const sp<IPreparedModelCallback>& callback,
 
 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 @@ Return<ErrorStatus> ArmnnDriverImpl<HalPolicy>::prepareModel(
         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()");
-- 
cgit v1.2.1