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

Commit 1ec5e308 authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Fix assert when dumping view at 0 alpha" into mnc-dev

parents 1e6d566c 43a1d31a

libs/hwui/RenderNode.cpp

+2 −1
Original line number Diff line number Diff line
@@ -83,8 +83,9 @@ void RenderNode::setStagingDisplayList(DisplayListData* data) { 
 * display list. This function should remain in sync with the replay() function.

 */

void RenderNode::output(uint32_t level) {

    ALOGD("%*sStart display list (%p, %s%s%s%s)", (level - 1) * 2, "", this,

    ALOGD("%*sStart display list (%p, %s%s%s%s%s)", (level - 1) * 2, "", this,

            getName(),

            (MathUtils::isZero(properties().getAlpha()) ? ", zero alpha" : ""),

            (properties().hasShadow() ? ", casting shadow" : ""),

            (isRenderable() ? "" : ", empty"),

            (mLayer != nullptr ? ", on HW Layer" : ""));

libs/hwui/RenderProperties.cpp

+2 −2
Original line number Diff line number Diff line
@@ -146,12 +146,12 @@ void RenderProperties::debugOutputProperties(const int level) const { 


    const bool isLayer = effectiveLayerType() != LayerType::None;

    int clipFlags = getClippingFlags();

    if (mPrimitiveFields.mAlpha < 1) {

    if (mPrimitiveFields.mAlpha < 1

            && !MathUtils::isZero(mPrimitiveFields.mAlpha)) {

        if (isLayer) {

            clipFlags &= ~CLIP_TO_BOUNDS; // bounds clipping done by layer

        }



        LOG_ALWAYS_FATAL_IF(!isLayer && mPrimitiveFields.mHasOverlappingRendering);

        ALOGD("%*sScaleAlpha %.2f", level * 2, "", mPrimitiveFields.mAlpha);

    }

    if (clipFlags) {