Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b644ac69 authored by Vishnu Nair's avatar Vishnu Nair Committed by Automerger Merge Worker
Browse files

Merge changes from topic "clamp-alpha" into tm-qpr-dev am: 04a03845 

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



Change-Id: I6805b7eb6f903bbf0a3e023b5c95a4a45d729958
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 16724c2c 04a03845

libs/gui/SurfaceComposerClient.cpp

+2 −5
Original line number Diff line number Diff line
@@ -1275,13 +1275,10 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setAlpha 
        return *this;

    }

    if (alpha < 0.0f || alpha > 1.0f) {

        ALOGE("SurfaceComposerClient::Transaction::setAlpha: invalid alpha %f", alpha);

        mStatus = BAD_VALUE;

        return *this;



        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;