summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Philip Junker <philipjunker@google.com> 2020-11-27 11:50:25 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-11-27 11:50:25 +0000
commitb4e1f173ad5811a2c3e2c7e64ee62ecfa66e5c61 (patch)
treed2fbde9b6ad90849c9d731cddf0a111d92be180f
parent0a6b674c91beb09ddd6db52f3d6a96a0ec56dd92 (diff)
parent60600569a07350f0449b6ecdf95af5871e9eef1c (diff)
Merge "Send shutdown callback only during animation destruction"
-rw-r--r--cmds/bootanimation/BootAnimation.cpp2
1 files changed, 1 insertions, 1 deletions
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();
}
}