Merge "Send shutdown callback only during animation destruction" am: 76a9e41247

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513319

Change-Id: I6c5763eca20bfdaa30b26fa0299cab4343b4fb77
This commit is contained in:
Philip Junker
2020-12-01 17:36:24 +00:00
committed by Automerger Merge Worker

View File

@@ -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();
}
}