Merge "[Lut] Add warning logs for luts" into main

Sally Qi · Android (Google) Code Review · commit 9211819aed73 · 2025-01-15T09:39:57.000-08:00
diff --git a/services/surfaceflinger/DisplayHardware/HWC2.cpp b/services/surfaceflinger/DisplayHardware/HWC2.cpp
@@ -640,7 +640,15 @@ Error Display::getRequestedLuts(LayerLuts* outLuts,
                 lutFileDescriptorMapper.emplace_or_replace(layer.get(),
                                                            ndk::ScopedFileDescriptor(
                                                                    layerLut.luts.pfd.release()));
+            } else {
+                ALOGE("getRequestedLuts: invalid luts on layer %" PRIu64 " found"
+                      " on display %" PRIu64 ". pfd.get()=%d, offsets.has_value()=%d",
+                      layerIds[i], mId, layerLut.luts.pfd.get(), layerLut.luts.offsets.has_value());
             }
+        } else {
+            ALOGE("getRequestedLuts: invalid layer %" PRIu64 " found"
+                  " on display %" PRIu64,
+                  layerIds[i], mId);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -640,7 +640,15 @@ Error Display::getRequestedLuts(LayerLuts* outLuts,`
`640`	`640`	`lutFileDescriptorMapper.emplace_or_replace(layer.get(),`
`641`	`641`	`ndk::ScopedFileDescriptor(`
`642`	`642`	`layerLut.luts.pfd.release()));`
	`643`	`+ } else {`
	`644`	`+ ALOGE("getRequestedLuts: invalid luts on layer %" PRIu64 " found"`
	`645`	`+ " on display %" PRIu64 ". pfd.get()=%d, offsets.has_value()=%d",`
	`646`	`+ layerIds[i], mId, layerLut.luts.pfd.get(), layerLut.luts.offsets.has_value());`
`643`	`647`	`}`
	`648`	`+ } else {`
	`649`	`+ ALOGE("getRequestedLuts: invalid layer %" PRIu64 " found"`
	`650`	`+ " on display %" PRIu64,`
	`651`	`+ layerIds[i], mId);`
`644`	`652`	`}`
`645`	`653`	`}`
`646`	`654`