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

Commit f6ecaaf5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the problem of slow exit of boot animation" am: 9a0581c0 

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



Change-Id: I9378f498e2c837f403ac51284327f39df01382d3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f1cfe0ee 9a0581c0

cmds/bootanimation/BootAnimation.cpp

+12 −1
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ static const char PROGRESS_PROP_NAME[] = "service.bootanim.progress"; 
static const char DISPLAYS_PROP_NAME[] = "persist.service.bootanim.displays";

static const char CLOCK_ENABLED_PROP_NAME[] = "persist.sys.bootanim.clock.enabled";

static const int ANIM_ENTRY_NAME_MAX = ANIM_PATH_MAX + 1;

static const int MAX_CHECK_EXIT_INTERVAL_US = 50000;

static constexpr size_t TEXT_POS_LEN_MAX = 16;

static const int DYNAMIC_COLOR_COUNT = 4;

static const char U_TEXTURE[] = "uTexture";
@@ -1680,7 +1681,17 @@ bool BootAnimation::playAnimation(const Animation& animation) { 
                checkExit();

            }



            usleep(part.pause * ns2us(frameDuration));

            int pauseDuration = part.pause * ns2us(frameDuration);

            while(pauseDuration > 0 && !exitPending()){

                if (pauseDuration > MAX_CHECK_EXIT_INTERVAL_US) {

                    usleep(MAX_CHECK_EXIT_INTERVAL_US);

                    pauseDuration -= MAX_CHECK_EXIT_INTERVAL_US;

                } else {

                    usleep(pauseDuration);

                    break;

                }

                checkExit();

            }



            if (exitPending() && !part.count && mCurrentInset >= mTargetInset &&

                !part.hasFadingPhase()) {