summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-04-20 23:22:49 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-04-20 23:22:49 +0000
commitafe3e11c65ca3284bd7fb981f3a8bf902f1f91d4 (patch)
tree9f541a23d3f2483d0140af11e5758685a6f56e3c
parent470e4ac9624d62439df6ccd245eecdf0e2152b18 (diff)
parentab581a4c04adc88b178f754c20c1915d73e204d1 (diff)
Merge "Check for null mBlastBufferQueue" into rvc-dev
-rw-r--r--core/java/android/view/ViewRootImpl.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 68a185d36315..9d275cdcb00f 100644
--- 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) {