commit d93edc76fb22958896d9e8a743dab65cc9a8ff82
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Aug 25 00:06:45 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 25 00:06:45 2023 +0000
tree 4996b52cb510d707ecd38fe9fb33bd41e56a42ea
parent a16769bc3af9eb5ccb25e8c7a26d48cbb3c59129
parent 7e9773de365eb9b99ca22bcb36f5ebf049ada2de

Merge "Fix potential thread violation in applying gainmaps" into udc-qpr-dev am: 7e9773de36

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24526679

Change-Id: I8fe08409242831d734ef820b70a85b71f1e33c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/hwui/effects/GainmapRenderer.cpp

diff --git a/libs/hwui/effects/GainmapRenderer.cpp b/libs/hwui/effects/GainmapRenderer.cpp
index 613f52b..651d526 100644
--- a/libs/hwui/effects/GainmapRenderer.cpp
+++ b/libs/hwui/effects/GainmapRenderer.cpp
@@ -54,14 +54,13 @@
         return maxPQLux / GenericSdrWhiteNits;
     } else if (skcms_TransferFunction_isHLGish(&destTF)) {
         return maxHLGLux / GenericSdrWhiteNits;
-    } else {
 #ifdef __ANDROID__
+    } else if (RenderThread::isCurrent()) {
         CanvasContext* context = CanvasContext::getActiveContext();
         return context ? context->targetSdrHdrRatio() : 1.f;
-#else
-        return 1.f;
 #endif
     }
+    return 1.f;
 }
 
 void DrawGainmapBitmap(SkCanvas* c, const sk_sp<const SkImage>& image, const SkRect& src,