Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f54756d authored by Philip Junker's avatar Philip Junker Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I6c5763eca20bfdaa30b26fa0299cab4343b4fb77
parents bd2f82c8 76a9e412
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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();
    }
}