Merge "Fix segfault in ViewRootImpl on BLAST"

2020-02-03 19:24:35 +00:00
parent f85843e63f f0a24dd2be
commit 3d08de1582
1 changed files with 4 additions and 2 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -1691,7 +1691,7 @@ public final class ViewRootImpl implements ViewParent,
                    .build();
            setBoundsLayerCrop();
            mTransaction.show(mBoundsLayer).apply();
-        } 
+        }
       return mBoundsLayer;
    }

@@ -1699,7 +1699,9 @@ public final class ViewRootImpl implements ViewParent,
        if (mSurfaceControl == null || !mSurfaceControl.isValid()) {
            return null;
        }
-        if ((mBlastBufferQueue != null) && mBlastSurfaceControl.isValid()) {
+        if ((mBlastSurfaceControl != null)
+                && (mBlastBufferQueue == null)
+                && mBlastSurfaceControl.isValid()) {
            mBlastBufferQueue = new BLASTBufferQueue(
                mBlastSurfaceControl, width, height);
        }