diff options
| author | 2023-04-07 23:07:18 +0000 | |
|---|---|---|
| committer | 2023-04-07 23:07:18 +0000 | |
| commit | fd453a4a8aa3fc5b123228110e9fb7024eec833f (patch) | |
| tree | cec251a01f08743ea62dd68b3f63eefef8f63774 /cmds/bootanimation/BootAnimation.cpp | |
| parent | fe1f1421fc8bca74062dc58722e0901e15e5c48b (diff) | |
| parent | f6ecaaf53617b84f1593da834f7043d5e8967e00 (diff) | |
Merge "Fix the problem of slow exit of boot animation" am: 9a0581c0c9 am: f6ecaaf536
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2369728
Change-Id: I8ad43aeb6b8e94f05140b9de031a2c49cc7cead8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'cmds/bootanimation/BootAnimation.cpp')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 6b6bc9728b7f..27dadda40407 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -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()) { |