From 60600569a07350f0449b6ecdf95af5871e9eef1c 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

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

(limited to 'cmds/bootanimation/BootAnimation.cpp')

diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index 046145f90808..3b4823e799ce 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -605,6 +605,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);
@@ -691,7 +692,6 @@ void BootAnimation::checkExit() {
     int exitnow = atoi(value);
     if (exitnow) {
         requestExit();
-        mCallbacks->shutdown();
     }
 }
 
-- 
cgit v1.2.3-59-g8ed1b