Merge "Check for null mBlastBufferQueue" into rvc-dev am: afe3e11c65 am: 66e60b40be am: a27a8f2ef6

Change-Id: I727d7f805669d1b37754b0a6defa08deb8ba7bcc
2020-04-21 11:21:13 +00:00
parent d64303f903 a27a8f2ef6
commit e06593c951
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -3779,7 +3779,9 @@ public final class ViewRootImpl implements ViewParent,
                mNextReportConsumeBLAST = true;
                mNextDrawUseBLASTSyncTransaction = false;

-                mBlastBufferQueue.setNextTransaction(mRtBLASTSyncTransaction);
+                if (mBlastBufferQueue != null) {
+                    mBlastBufferQueue.setNextTransaction(mRtBLASTSyncTransaction);
+                }
            }
            boolean canUseAsync = draw(fullRedrawNeeded);
            if (usingAsyncReport && !canUseAsync) {