summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-14 08:09:04 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-14 08:09:04 +0000
commite9a5e9e57380e38283571eb3bb75db941a44b378 (patch)
treef2ab619f87a51f331eea8f93ecf7cd15449eaaeb
parent9f4673fc94d4f88e9d08d21224b49a1b3588011a (diff)
parent04a038456b9b53c18621c95add857a044a2a4e65 (diff)
downloadnative-e9a5e9e57380e38283571eb3bb75db941a44b378.tar.gz
Snap for 9929149 from 04a038456b9b53c18621c95add857a044a2a4e65 to tm-qpr3-c-release
Change-Id: Idafa5b534a4ae61397dc85a34049db90cc7e12e6
-rw-r--r--libs/gui/SurfaceComposerClient.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index 0f5192d41c..05beb07891 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -1274,8 +1274,11 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setAlpha
mStatus = BAD_INDEX;
return *this;
}
+ if (alpha < 0.0f || alpha > 1.0f) {
+ ALOGE("SurfaceComposerClient::Transaction::setAlpha: invalid alpha %f, clamping", alpha);
+ }
s->what |= layer_state_t::eAlphaChanged;
- s->alpha = alpha;
+ s->alpha = std::clamp(alpha, 0.f, 1.f);
registerSurfaceControlForCallback(sc);
return *this;