[Lut HAL] change func name to takeDisplayLut instead.
- also fix some build warnings.
Bug: 329472100
Test: builds
Change-Id: I8b6e25e150c00bdef0606b380bdaeb228cc7ba35
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 fbfac87..fc96882 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 @@
}
// Get the lut(s) requested by hardware composer.
- std::vector<Lut> takeLuts(int64_t display) {
+ std::vector<Lut> takeDisplayLuts(int64_t display) {
LOG_ALWAYS_FATAL_IF(mDisplay && display != *mDisplay);
auto found = mReturnData.find(display);
@@ -249,8 +249,7 @@
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});
}
}