Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I695500d71a4fc0c4340eb58630ada970c98f3a8a
This commit is contained in:
Philip Junker
2020-12-01 18:07:31 +00:00
committed by Automerger Merge Worker
parent 70edf54d81 3f54756d91
commit ccc3d0f14b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/bootanimation/BootAnimation.cpp
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();
} }
} }