diff options
| author | Vishnu Nair <vishnun@google.com> | 2023-04-11 20:17:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-04-11 20:17:42 +0000 |
| commit | 04a038456b9b53c18621c95add857a044a2a4e65 (patch) | |
| tree | f2ab619f87a51f331eea8f93ecf7cd15449eaaeb | |
| parent | 9f4673fc94d4f88e9d08d21224b49a1b3588011a (diff) | |
| parent | 2b1856e8c4177ffc8b8ffb357da56409b4c3e187 (diff) | |
| download | native-04a038456b9b53c18621c95add857a044a2a4e65.tar.gz | |
Merge changes from topic "clamp-alpha" into tm-qpr-dev
* changes:
SF: clamp alpha value instead of error
SurfaceComposerClient: add a range check in setAlpha
| -rw-r--r-- | libs/gui/SurfaceComposerClient.cpp | 5 |
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; |