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

Change-Id: I1c37efcd048f3e3d0faed467e36e9eec65c1773f
2020-04-21 10:57:45 +00:00
parent d92251908f afe3e11c65
commit 66e60b40be
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) {