Revert "Add HAL version 1.3 and add TENSOR_QUANT8_ASYMM_SIGNED OperandType"

This reverts commit af88effce1b911743d562f5490af2300c54f2349.

Reason for revert: the topic breaks git_qt-dev-plus-aosp

Change-Id: Iddfcffb76af61fb20d749902ddf9c960e211c69d

2 files changed, 13 insertions, 13 deletions

diff --git a/nn/runtime/test/fibonacci_extension/FibonacciDriver.cpp b/nn/runtime/test/fibonacci_extension/FibonacciDriver.cpp
index 36d255224..cd1edb618 100644
--- a/nn/runtime/test/fibonacci_extension/FibonacciDriver.cpp
+++ b/nn/runtime/test/fibonacci_extension/FibonacciDriver.cpp
@@ -18,9 +18,6 @@
 
 #include "FibonacciDriver.h"
 
-#include <vector>
-
-#include "FibonacciExtension.h"
 #include "HalInterfaces.h"
 #include "NeuralNetworksExtensions.h"
 #include "OperationResolver.h"
@@ -28,6 +25,10 @@
 #include "Utils.h"
 #include "ValidateHal.h"
 
+#include "FibonacciExtension.h"
+
+#include <vector>
+
 namespace android {
 namespace nn {
 namespace sample_driver {
@@ -172,20 +173,19 @@ Return<void> FibonacciDriver::getSupportedExtensions(getSupportedExtensions_cb c
     return Void();
 }
 
-Return<void> FibonacciDriver::getCapabilities_1_3(getCapabilities_1_3_cb cb) {
+Return<void> FibonacciDriver::getCapabilities_1_2(getCapabilities_1_2_cb cb) {
     android::nn::initVLogMask();
     VLOG(DRIVER) << "getCapabilities()";
     static const PerformanceInfo kPerf = {.execTime = 1.0f, .powerUsage = 1.0f};
-    Capabilities capabilities = {
-            .relaxedFloat32toFloat16PerformanceScalar = kPerf,
-            .relaxedFloat32toFloat16PerformanceTensor = kPerf,
-            .operandPerformance = nonExtensionOperandPerformance<HalVersion::V1_3>(kPerf)};
+    Capabilities capabilities = {.relaxedFloat32toFloat16PerformanceScalar = kPerf,
+                                 .relaxedFloat32toFloat16PerformanceTensor = kPerf,
+                                 .operandPerformance = nonExtensionOperandPerformance(kPerf)};
     cb(ErrorStatus::NONE, capabilities);
     return Void();
 }
 
-Return<void> FibonacciDriver::getSupportedOperations_1_3(const V1_3::Model& model,
-                                                         getSupportedOperations_1_3_cb cb) {
+Return<void> FibonacciDriver::getSupportedOperations_1_2(const V1_2::Model& model,
+                                                         getSupportedOperations_1_2_cb cb) {
     VLOG(DRIVER) << "getSupportedOperations()";
     if (!validateModel(model)) {
         cb(ErrorStatus::INVALID_ARGUMENT, {});
diff --git a/nn/runtime/test/fibonacci_extension/FibonacciDriver.h b/nn/runtime/test/fibonacci_extension/FibonacciDriver.h
index 303edd809..2ae6da0ea 100644
--- a/nn/runtime/test/fibonacci_extension/FibonacciDriver.h
+++ b/nn/runtime/test/fibonacci_extension/FibonacciDriver.h
@@ -46,9 +46,9 @@ class FibonacciDriver : public SampleDriver {
    public:
     FibonacciDriver() : SampleDriver(kDriverName, FibonacciOperationResolver::get()) {}
     hal::Return<void> getSupportedExtensions(getSupportedExtensions_cb cb) override;
-    hal::Return<void> getCapabilities_1_3(getCapabilities_1_3_cb cb) override;
-    hal::Return<void> getSupportedOperations_1_3(const hal::V1_3::Model& model,
-                                                 getSupportedOperations_1_3_cb cb) override;
+    hal::Return<void> getCapabilities_1_2(getCapabilities_1_2_cb cb) override;
+    hal::Return<void> getSupportedOperations_1_2(const hal::V1_2::Model& model,
+                                                 getSupportedOperations_1_2_cb cb) override;
 
     static constexpr char kDriverName[] = "sample-driver-fibonacci-extension";
 };