From 420a72f7c3270d0866ece5d7bd4141640a91ff68 Mon Sep 17 00:00:00 2001 From: Sally Qi Date: Wed, 14 Aug 2024 09:29:53 -0700 Subject: [PATCH] [Lut HAL] change func name to takeDisplayLut instead. - also fix some build warnings. Bug: 329472100 Test: builds Change-Id: I8b6e25e150c00bdef0606b380bdaeb228cc7ba35 --- .../hardware/graphics/composer3/ComposerClientReader.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/graphics/composer/aidl/include/android/hardware/graphics/composer3/ComposerClientReader.h b/graphics/composer/aidl/include/android/hardware/graphics/composer3/ComposerClientReader.h index fbfac87f9d..fc96882ac3 100644 --- a/graphics/composer/aidl/include/android/hardware/graphics/composer3/ComposerClientReader.h +++ b/graphics/composer/aidl/include/android/hardware/graphics/composer3/ComposerClientReader.h @@ -186,7 +186,7 @@ class ComposerClientReader { } // Get the lut(s) requested by hardware composer. - std::vector takeLuts(int64_t display) { + std::vector takeDisplayLuts(int64_t display) { LOG_ALWAYS_FATAL_IF(mDisplay && display != *mDisplay); auto found = mReturnData.find(display); @@ -249,8 +249,7 @@ class ComposerClientReader { auto& data = mReturnData[displayLuts.display]; for (auto& lut : displayLuts.luts) { if (lut.pfd.get() >= 0) { - data.luts.push_back({lut.layer, - std::move(ndk::ScopedFileDescriptor(lut.pfd.release())), + data.luts.push_back({lut.layer, ndk::ScopedFileDescriptor(lut.pfd.release()), lut.lutProperties}); } }