Cleanup HalInterfaces.h

Prior to this CL, HalInterfaces.h polluted the global namespace through
the "using" declarations. This CL creates a new ::android::nn::hal
namespace and places the names there instead.

This CL also changes the namespace of the Callback objects from
::android::hardware::neuralnetworks::V1_2::implementation to
::android::nn to be consistent with the other parts of frameworks/ml/nn.

Fixes: 72880287
Test: mma
Change-Id: I399ad32f5c541a493429c6fa8e192169a903ea9f
Merged-In: I399ad32f5c541a493429c6fa8e192169a903ea9f
(cherry picked from commit 19af9d2d509621c0b07fb5a0f59abd0adb9de468)

2 files changed, 8 insertions, 5 deletions

diff --git a/nn/runtime/test/fibonacci_extension/FibonacciDriver.cpp b/nn/runtime/test/fibonacci_extension/FibonacciDriver.cpp
index 7c1b2af87..85a708b1a 100644
--- a/nn/runtime/test/fibonacci_extension/FibonacciDriver.cpp
+++ b/nn/runtime/test/fibonacci_extension/FibonacciDriver.cpp
@@ -32,6 +32,8 @@ namespace nn {
 namespace sample_driver {
 namespace {
 
+using namespace hal;
+
 const uint8_t kLowBitsType = static_cast<uint8_t>(Model::ExtensionTypeEncoding::LOW_BITS_TYPE);
 const uint32_t kTypeWithinExtensionMask = (1 << kLowBitsType) - 1;
 
diff --git a/nn/runtime/test/fibonacci_extension/FibonacciDriver.h b/nn/runtime/test/fibonacci_extension/FibonacciDriver.h
index d9a43b2a1..5cda2c846 100644
--- a/nn/runtime/test/fibonacci_extension/FibonacciDriver.h
+++ b/nn/runtime/test/fibonacci_extension/FibonacciDriver.h
@@ -17,6 +17,7 @@
 #ifndef FRAMEWORKS_ML_NN_RUNTIME_TEST_FIBONACCI_EXTENSION_FIBONACCI_DRIVER_H
 #define FRAMEWORKS_ML_NN_RUNTIME_TEST_FIBONACCI_EXTENSION_FIBONACCI_DRIVER_H
 
+#include "HalInterfaces.h"
 #include "OperationResolver.h"
 #include "SampleDriver.h"
 
@@ -33,7 +34,7 @@ class FibonacciOperationResolver : public IOperationResolver {
         return &instance;
     }
 
-    const OperationRegistration* findOperation(OperationType operationType) const override;
+    const OperationRegistration* findOperation(hal::OperationType operationType) const override;
 
    private:
     FibonacciOperationResolver() {}
@@ -44,10 +45,10 @@ class FibonacciOperationResolver : public IOperationResolver {
 class FibonacciDriver : public SampleDriver {
    public:
     FibonacciDriver() : SampleDriver(kDriverName, FibonacciOperationResolver::get()) {}
-    Return<void> getSupportedExtensions(getSupportedExtensions_cb cb) override;
-    Return<void> getCapabilities_1_2(getCapabilities_1_2_cb cb) override;
-    Return<void> getSupportedOperations_1_2(const V1_2::Model& model,
-                                            getSupportedOperations_1_2_cb cb) override;
+    hal::Return<void> getSupportedExtensions(getSupportedExtensions_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";
 };