summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-12 23:21:01 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-04-12 23:21:01 +0000
commitfcb79999f4583a4bf47f695db4226b7e23050cf0 (patch)
treef2ab619f87a51f331eea8f93ecf7cd15449eaaeb
parent61c5214a0c03539a05bf29fcac155cb409b1e232 (diff)
parent04a038456b9b53c18621c95add857a044a2a4e65 (diff)
downloadnative-fcb79999f4583a4bf47f695db4226b7e23050cf0.tar.gz
Snap for 9929149 from 04a038456b9b53c18621c95add857a044a2a4e65 to tm-qpr3-release
Change-Id: I37bb19cae036ceb66f69ad254a972e7f75333dba
-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;