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

Commit d28b7331 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add null pointer check to avoid system crash." am: a04929ef am: ed06ccd4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2189316



Change-Id: Ifc1301fa826bc3c2c4657a855b26c78f570ff526
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 14847368 ed06ccd4

libs/hwui/renderthread/DrawFrameTask.cpp

+3 −1
Original line number Diff line number Diff line
@@ -243,8 +243,10 @@ bool DrawFrameTask::syncFrameState(TreeInfo& info) { 
    mContext->unpinImages();



    for (size_t i = 0; i < mLayers.size(); i++) {

        if (mLayers[i]) {

            mLayers[i]->apply();

        }

    }

    mLayers.clear();

    mContext->setContentDrawBounds(mContentDrawBounds);

    mContext->prepareTree(info, mFrameInfo, mSyncQueued, mTargetNode);