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 am: ed06ccd402 am: d28b73315c

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

Change-Id: Ia8b354d0260fce5be05c09d06d9c5e9a97d79a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-09-29 00:14:08 +00:00
committed by Automerger Merge Worker
parent ff92c38abd d28b73315c
commit 913cc9a60a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -243,7 +243,9 @@ 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++) {
mLayers[i]->apply(); if (mLayers[i]) {
mLayers[i]->apply();
}
} }
mLayers.clear(); mLayers.clear();
mContext->setContentDrawBounds(mContentDrawBounds); mContext->setContentDrawBounds(mContentDrawBounds);