commit f760323d100e6fc07f88663fe935dd1f9ec61652
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 24 18:40:10 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 24 18:40:10 2022 +0000
tree 2ccd1d86cc41a4c375f4862e388d49edd9b1e15f
parent ddc82226b3f1cbf3a3b963bcbfce9643555b8544
parent 724b0f56b27908a1ac6538c29e6ea5a2336fb531

Merge "Enable shrinking for EasterEgg"

opengl/java/android/opengl/GLSurfaceView.java

diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java
index 75131b0..4738318 100644
--- a/opengl/java/android/opengl/GLSurfaceView.java
+++ b/opengl/java/android/opengl/GLSurfaceView.java
@@ -1667,7 +1667,15 @@
                 mWantRenderNotification = true;
                 mRequestRender = true;
                 mRenderComplete = false;
-                mFinishDrawingRunnable = finishDrawing;
+                final Runnable oldCallback = mFinishDrawingRunnable;
+                mFinishDrawingRunnable = () -> {
+                    if (oldCallback != null) {
+                        oldCallback.run();
+                    }
+                    if (finishDrawing != null) {
+                        finishDrawing.run();
+                    }
+                };
 
                 sGLThreadManager.notifyAll();
             }