Fixing ambiguous method name in BackendHelper.

!android-nn-driver:10035

* Two of the 4 HasCapability methods in BackendHelper were checking the
  value of the capability not just the existence of the capability.

Signed-off-by: Colm Donelan <colm.donelan@arm.com>
Change-Id: I63bc1671dfb088a947de70a21c86d2502f92f008

1 files changed, 12 insertions, 2 deletions

diff --git a/src/armnn/BackendHelper.cpp b/src/armnn/BackendHelper.cpp
index 0a55a08087..f025193006 100644
--- a/src/armnn/BackendHelper.cpp
+++ b/src/armnn/BackendHelper.cpp
@@ -74,6 +74,16 @@ bool HasCapability(const std::string& name, const armnn::BackendId& backend)
 
 bool HasCapability(const BackendOptions::BackendOption& capability, const BackendCapabilities& capabilities)
 {
+    return HasMatchingCapability(capability, capabilities);
+}
+
+bool HasCapability(const BackendOptions::BackendOption& backendOption, const armnn::BackendId& backend)
+{
+    return HasMatchingCapability(backendOption, backend);
+}
+
+bool HasMatchingCapability(const BackendOptions::BackendOption& capability, const BackendCapabilities& capabilities)
+{
     for (size_t i=0; i < capabilities.GetOptionCount(); i++)
     {
         const auto& backendCapability = capabilities.GetOption(i);
@@ -104,7 +114,7 @@ bool HasCapability(const BackendOptions::BackendOption& capability, const Backen
     return false;
 }
 
-bool HasCapability(const BackendOptions::BackendOption& backendOption, const armnn::BackendId& backend)
+bool HasMatchingCapability(const BackendOptions::BackendOption& backendOption, const armnn::BackendId& backend)
 {
     auto const& backendRegistry = armnn::BackendRegistryInstance();
     if (backendRegistry.IsBackendRegistered(backend))
@@ -112,7 +122,7 @@ bool HasCapability(const BackendOptions::BackendOption& backendOption, const arm
         auto factoryFunc = backendRegistry.GetFactory(backend);
         auto backendObject = factoryFunc();
         auto capabilities = backendObject->GetCapabilities();
-        return HasCapability(backendOption, capabilities);
+        return HasMatchingCapability(backendOption, capabilities);
     }
     return false;
 }