tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Set correct API level for NNAPI AIDL service discovery." am: f61f789f86 am: 3d4bd3ef47

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

Change-Id: Ia79a4a3189a84591d35ab2303d2e20be77a21efa
This commit is contained in:
Przemyslaw Szczepaniak 2021-04-12 14:04:10 +00:00 committed by Automerger Merge Worker
commit 1f7df75f4c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
neuralnetworks/utils/service/src/Service.cpp
View file

@ -16,6 +16,7 @@
#include "Service.h" #include "Service.h"
#include <AndroidVersionUtil.h>
#include <aidl/android/hardware/neuralnetworks/IDevice.h> #include <aidl/android/hardware/neuralnetworks/IDevice.h>
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android/binder_manager.h> #include <android/binder_manager.h>
@ -82,7 +83,7 @@ void getAidlDevices(std::vector<nn::SharedDevice>* devices,
// Devices with SDK level lower than 31 (Android S) don't have any AIDL drivers available, so // Devices with SDK level lower than 31 (Android S) don't have any AIDL drivers available, so
// there is no need for a workaround supported on lower levels. // there is no need for a workaround supported on lower levels.
if (__builtin_available(android __ANDROID_API_S__, *)) { if (__builtin_available(android __NNAPI_AIDL_MIN_ANDROID_API__, *)) {
AServiceManager_forEachDeclaredInstance(aidl_hal::IDevice::descriptor, AServiceManager_forEachDeclaredInstance(aidl_hal::IDevice::descriptor,
static_cast<void*>(&names), callback); static_cast<void*>(&names), callback);
} }