From f1291ba703ec7b6e6f4f020f72085801194d029e Mon Sep 17 00:00:00 2001
From: Philip Junker <philipjunker@google.com>
Date: Wed, 25 Nov 2020 18:16:16 +0100
Subject: Send shutdown callback only during animation destruction

The shutdown callback is currently used only by audioplay.cpp to destroy the audio player.
Sending shutdown when the animation is destructed makes sure the audio
player is not being destroyed before its boot animation part is being displayed.

Test: Modified bootanimation, sound in second last part of bootanimation
plays
Bug: 157407957
Bug: 127254055
Merged-In: I47f57643791e73e4a4fa1597309dccb1f52f2316

Change-Id: I47f57643791e73e4a4fa1597309dccb1f52f2316
---
 cmds/bootanimation/BootAnimation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmds')

diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index 5bcf30771436..2c7ee212b7b5 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -582,6 +582,7 @@ bool BootAnimation::threadLoop() {
         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 @@ void BootAnimation::checkExit() {
     int exitnow = atoi(value);
     if (exitnow) {
         requestExit();
-        mCallbacks->shutdown();
     }
 }
 
-- 
cgit v1.2.3