Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I8852deb12631005a3723a075ed6e36065d08c0c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-09-28 23:12:10 +00:00
committed by Automerger Merge Worker
parent 2f941f7af3 a04929ef9e
commit ed06ccd402
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/renderthread/DrawFrameTask.cpp
View File

@@ -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);