summaryrefslogtreecommitdiff
path: root/cmds/bootanimation/BootAnimation.h
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2021-04-21 09:54:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-04-21 09:54:52 +0000
commitdb45defb94a53e63c12a800df1983b6a4da35c18 (patch)
treee4aba76f06bbcdba6678fe370c9fb1208145c3f3 /cmds/bootanimation/BootAnimation.h
parenta9b3e555a8e238f2c0dd3c83009c3d486bc4e881 (diff)
parent55b2ba298c378e350f32e7351ff6a3fb4a960105 (diff)
Merge "bootanimation: ensure that if a percent is shown, we'll get to 100." am: 87c254de0e am: 10e844df41 am: 55b2ba298c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1681127 Change-Id: I1ee402945af4207affb77d61eb76a21c175ac1fc
Diffstat (limited to 'cmds/bootanimation/BootAnimation.h')
-rw-r--r--cmds/bootanimation/BootAnimation.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/bootanimation/BootAnimation.h b/cmds/bootanimation/BootAnimation.h
index 07432a2168b1..f8a31c6d8790 100644
--- a/cmds/bootanimation/BootAnimation.h
+++ b/cmds/bootanimation/BootAnimation.h
@@ -187,7 +187,8 @@ private:
void resizeSurface(int newWidth, int newHeight);
void projectSceneToWindow();
- bool shouldStopPlayingPart(const Animation::Part& part, int fadedFramesCount);
+ bool shouldStopPlayingPart(const Animation::Part& part, int fadedFramesCount,
+ int lastDisplayedProgress);
void checkExit();
void handleViewport(nsecs_t timestep);