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

Commit 913cc9a6 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 am: d28b7331 

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



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

libs/hwui/renderthread/DrawFrameTask.cpp

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

    mContext->unpinImages();





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

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

        if (mLayers[i]) {

            mLayers[i]->apply();

            mLayers[i]->apply();

        }

        }

    }

    mLayers.clear();

    mLayers.clear();

    mContext->setContentDrawBounds(mContentDrawBounds);

    mContext->setContentDrawBounds(mContentDrawBounds);

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

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