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

Commit 04a03845 authored by Vishnu Nair's avatar Vishnu Nair Committed by Android (Google) Code Review
Browse files

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
parents 9f4673fc 2b1856e8

libs/gui/SurfaceComposerClient.cpp

+4 −1
Original line number Diff line number Diff line
@@ -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;