diff options
| author | Philip Junker <philipjunker@google.com> | 2020-11-25 18:16:16 +0100 |
|---|---|---|
| committer | Philip Junker <philipjunker@google.com> | 2020-12-01 16:45:52 +0100 |
| commit | f1291ba703ec7b6e6f4f020f72085801194d029e (patch) | |
| tree | f7a68c6f530ec508c70f14efb74216956e799334 /cmds/bootanimation/BootAnimation.cpp | |
| parent | 854bb5b5eb64fc2743d1e0b479539d626763a969 (diff) | |
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
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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(); } } |