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

Commit 4df90e51 authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge "SF: clamp alpha value instead of error"

parents 9e9b1f60 24d0b2a1
Loading
Loading
Loading
Loading
+2 −5
Original line number Diff line number Diff line
@@ -1270,13 +1270,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;