| commit | 50d0484c6b15a388f21043f7baa04f30eca0ce60 | [log] [tgz] |
|---|---|---|
| author | Alec Mouri <alecmouri@google.com> | Wed May 17 19:07:05 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 17 19:07:05 2023 +0000 |
| tree | cdc84600dfb6bc0842c9fa4647609817688df3c3 | |
| parent | 177485246f31622ced26489f380053cbf085a297 [diff] | |
| parent | 12baa2e688e7a2cb8fbb3480220d0142815ef7d1 [diff] |
Merge "Disable HDR screenshots" into udc-dev am: 12baa2e688 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23272436 Change-Id: I760ad786d5a07e61937f3088b99767c58a5db28d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index d55ec99..5d96fc4 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -6992,7 +6992,8 @@ const auto dataspaceForColorMode = ui::pickDataspaceFor(state.colorMode); - if (capturingHdrLayers && !hintForSeamlessTransition) { + // TODO: Enable once HDR screenshots are ready. + if constexpr (/* DISABLES CODE */ (false)) { // For now since we only support 8-bit screenshots, just use HLG and // assume that 1.0 >= display max luminance. This isn't quite as future // proof as PQ is, but is good enough.