Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f7df75f authored by Przemyslaw Szczepaniak's avatar Przemyslaw Szczepaniak Committed by Automerger Merge Worker
Browse files

Merge "Set correct API level for NNAPI AIDL service discovery." am: f61f789f am: 3d4bd3ef 

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

Change-Id: Ia79a4a3189a84591d35ab2303d2e20be77a21efa
parents 794ed1a0 3d4bd3ef

neuralnetworks/utils/service/src/Service.cpp

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#include "Service.h"



#include <AndroidVersionUtil.h>

#include <aidl/android/hardware/neuralnetworks/IDevice.h>

#include <android-base/logging.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

    // 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,

                                                static_cast<void*>(&names), callback);

    }