commit 76a9e412474bb8dbe2311b6be161b58a1b6f56c6
author Philip Junker <philipjunker@google.com> Tue Dec 01 17:01:00 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 01 17:01:00 2020 +0000
tree e96191eb546c84ce9e77cf8d34f7c918057bc5fe
parent c0b44fca8bf82d7b21fe1ab01bcb334fb03b4207
parent f1291ba703ec7b6e6f4f020f72085801194d029e

Merge "Send shutdown callback only during animation destruction"

cmds/bootanimation/BootAnimation.cpp

diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index 5bcf307..2c7ee21 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -582,6 +582,7 @@
         result = movie();
     }
 
+    mCallbacks->shutdown();
     eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
     eglDestroyContext(mDisplay, mContext);
     eglDestroySurface(mDisplay, mSurface);
@@ -668,7 +669,6 @@
     int exitnow = atoi(value);
     if (exitnow) {
         requestExit();
-        mCallbacks->shutdown();
     }
 }