Merge "Send shutdown callback only during animation destruction"

This commit is contained in:
Philip Junker
2020-12-01 17:01:00 +00:00
committed by Gerrit Code Review

View File

@@ -582,6 +582,7 @@ bool BootAnimation::threadLoop() {
result = movie(); result = movie();
} }
mCallbacks->shutdown();
eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
eglDestroyContext(mDisplay, mContext); eglDestroyContext(mDisplay, mContext);
eglDestroySurface(mDisplay, mSurface); eglDestroySurface(mDisplay, mSurface);
@@ -668,7 +669,6 @@ void BootAnimation::checkExit() {
int exitnow = atoi(value); int exitnow = atoi(value);
if (exitnow) { if (exitnow) {
requestExit(); requestExit();
mCallbacks->shutdown();
} }
} }