From a4a73461c2e5244b701cd0ba1ce959d2ed0dc95d Mon Sep 17 00:00:00 2001 From: Pawan Wagh Date: Fri, 9 Feb 2024 23:44:17 +0000 Subject: [PATCH] Downgrade fatal log on host to error Fuzzer is breaking due to fatal log for host. Downgrade it to error. Test: m android.hardware.neuralnetworks-service.example_fuzzer && out/host/linux-x86/fuzz/x86_64/android.hardware.neuralnetworks-service.example_fuzzer/android.hardware.neuralnetworks-service.example_fuzzer Bug: 312902296 Change-Id: I7013ed14f6644d0459929380202de45f92575cf9 --- neuralnetworks/aidl/utils/src/Conversions.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neuralnetworks/aidl/utils/src/Conversions.cpp b/neuralnetworks/aidl/utils/src/Conversions.cpp index 47c72b47af..9f920bb122 100644 --- a/neuralnetworks/aidl/utils/src/Conversions.cpp +++ b/neuralnetworks/aidl/utils/src/Conversions.cpp @@ -421,7 +421,7 @@ GeneralResult unvalidatedConvert(const aidl_hal::Memory& memory) { return createSharedMemoryFromAHWB(ahwb, /*takeOwnership=*/true); #else // __ANDROID__ - LOG(FATAL) << "GeneralResult unvalidatedConvert(const aidl_hal::Memory& " + LOG(ERROR) << "GeneralResult unvalidatedConvert(const aidl_hal::Memory& " "memory): Not Available on Host Build"; return NN_ERROR() << "createFromHandle failed"; #endif // __ANDROID__ @@ -732,7 +732,7 @@ nn::GeneralResult unvalidatedConvert(const nn::Memory::HardwareBuffer& m }; return Memory::make(std::move(hardwareBuffer)); #else // __ANDROID__ - LOG(FATAL) << "nn::GeneralResult unvalidatedConvert(const nn::Memory::HardwareBuffer& " + LOG(ERROR) << "nn::GeneralResult unvalidatedConvert(const nn::Memory::HardwareBuffer& " "memory): Not Available on Host Build"; (void)memory; return (NN_ERROR() << "unvalidatedConvert failed").operator nn::GeneralResult();