| commit | b149355d2b6ace4298b70563e5723e51b2f370b1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Sep 29 00:57:51 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 29 00:57:51 2022 +0000 |
| tree | 196fff3e1cd58206dc964d5f9015d1d13e12c500 | |
| parent | 5301858e43ff00d6d1002c3be7927f8cda6c6bad [diff] | |
| parent | 913cc9a60a65f9efdb710576259a7b6a58268019 [diff] |
Merge "Add null pointer check to avoid system crash." am: a04929ef9e am: ed06ccd402 am: d28b73315c am: 913cc9a60a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2189316 Change-Id: Ia4646626449740825bfee90f3a9b9bf4c6b297bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/hwui/renderthread/DrawFrameTask.cpp b/libs/hwui/renderthread/DrawFrameTask.cpp index 59c914f..03f02de 100644 --- a/libs/hwui/renderthread/DrawFrameTask.cpp +++ b/libs/hwui/renderthread/DrawFrameTask.cpp
@@ -243,7 +243,9 @@ mContext->unpinImages(); for (size_t i = 0; i < mLayers.size(); i++) { - mLayers[i]->apply(); + if (mLayers[i]) { + mLayers[i]->apply(); + } } mLayers.clear(); mContext->setContentDrawBounds(mContentDrawBounds);