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

Change-Id: Iefbc17cbaf350b86e07dcc786044d9f271ec7506
2020-04-21 11:04:58 +00:00
parent 740192a082 66e60b40be
commit a27a8f2ef6
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) {