From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 6 Apr 2022 01:10:00 -0400 Subject: [PATCH] Use basic boot animation Signed-off-by: Tad Change-Id: I0c87ddd9aec21fc610f3d17701192c04150308d7 --- cmds/bootanimation/BootAnimation.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 217c7ce47e79..22b4d8ef4632 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -743,7 +743,7 @@ GLuint linkShader(GLuint vertexShader, GLuint fragmentShader) { } void BootAnimation::initShaders() { - bool dynamicColoringEnabled = mAnimation != nullptr && mAnimation->dynamicColoringEnabled; + bool dynamicColoringEnabled = false; GLuint vertexShader = compileShader(GL_VERTEX_SHADER, (const GLchar *)VERTEX_SHADER_SOURCE); GLuint imageFragmentShader = compileShader(GL_FRAGMENT_SHADER, dynamicColoringEnabled @@ -779,13 +779,7 @@ bool BootAnimation::threadLoop() { bool result; initShaders(); - // We have no bootanimation file, so we use the stock android logo - // animation. - if (mZipFileName.isEmpty()) { - result = android(); - } else { - result = movie(); - } + result = android(); mCallbacks->shutdown(); eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);