Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Configure Version value for each version of NN AIDL utils" am: 21e079c9e2 am: a0c2165144

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1890278

Change-Id: Id61aa7461f42d836c591541953c80352d8c7c2d1
This commit is contained in:
Michael Butler
2021-11-16 20:12:00 +00:00
committed by Automerger Merge Worker
parent 4651b98b59 a0c2165144
commit 99aea2fe82
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
neuralnetworks/aidl/utils/include/nnapi/hal/aidl/Utils.h
View File

@@ -19,6 +19,7 @@
#include "nnapi/hal/aidl/Conversions.h" #include "nnapi/hal/aidl/Conversions.h"
#include <aidl/android/hardware/neuralnetworks/IDevice.h>
#include <android-base/logging.h> #include <android-base/logging.h>
#include <nnapi/Result.h> #include <nnapi/Result.h>
#include <nnapi/TypeUtils.h> #include <nnapi/TypeUtils.h>
@@ -28,7 +29,19 @@
namespace aidl::android::hardware::neuralnetworks::utils { namespace aidl::android::hardware::neuralnetworks::utils {
constexpr auto kDefaultPriority = Priority::MEDIUM; constexpr auto kDefaultPriority = Priority::MEDIUM;
constexpr auto kVersion = nn::Version::FEATURE_LEVEL_6;
constexpr std::optional<nn::Version> aidlVersionToCanonicalVersion(int aidlVersion) {
switch (aidlVersion) {
case 1:
return nn::Version::ANDROID_S;
case 2:
return nn::Version::FEATURE_LEVEL_6;
default:
return std::nullopt;
}
}
constexpr auto kVersion = aidlVersionToCanonicalVersion(IDevice::version).value();
template <typename Type> template <typename Type>
nn::Result<void> validate(const Type& halObject) { nn::Result<void> validate(const Type& halObject) {

10
neuralnetworks/aidl/utils/src/Service.cpp
View File

@@ -46,13 +46,11 @@ nn::GeneralResult<nn::Version> getAidlServiceFeatureLevel(IDevice* service) {
aidlVersion = std::min(aidlVersion, IDevice::version); aidlVersion = std::min(aidlVersion, IDevice::version);
// Map stable AIDL versions to canonical versions. // Map stable AIDL versions to canonical versions.
switch (aidlVersion) { auto version = aidlVersionToCanonicalVersion(aidlVersion);
case 1: if (!version.has_value()) {
return nn::Version::ANDROID_S; return NN_ERROR() << "Unknown AIDL service version: " << aidlVersion;
case 2:
return nn::Version::FEATURE_LEVEL_6;
} }
return NN_ERROR() << "Unknown AIDL service version: " << aidlVersion; return version.value();
} }
} // namespace } // namespace