diff options
| author | Kevin Hester <khester@google.com> | 2012-04-26 10:38:55 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2012-06-19 17:38:43 -0700 |
| commit | d3782b26b2026e60a8e0d4b967a156369f2a46f8 (patch) | |
| tree | 4cdd65f7346993aea94bedf15fbd91e910b74b33 /cmds/bootanimation/BootAnimation.h | |
| parent | fe54cb6f3da7fe95d5141d97b0c6780e001ad058 (diff) | |
| download | frameworks_base-d3782b26b2026e60a8e0d4b967a156369f2a46f8.zip frameworks_base-d3782b26b2026e60a8e0d4b967a156369f2a46f8.tar.gz frameworks_base-d3782b26b2026e60a8e0d4b967a156369f2a46f8.tar.bz2 | |
Exit boot animation cleanly.
The desc.txt file can now mark parts as 'must finish cleanly' by using
'c' as the part line prefix rather than 'p'. If so indicated, if the
bootanimation is asked to quit it will do so only after waiting to
finish that part.
I considered either making init.c service killing smarter or promoting
bootanim to be a bindable service with a requestExit method. However,
these changes are probably too big/risky given our ship date. So
I used a property as a mailbox between SurfaceFlinger and bootanim.
Bug: 6679877
Change-Id: I1f8dd9e7da1ea80a483b31fa14c4a5645922d774
Diffstat (limited to 'cmds/bootanimation/BootAnimation.h')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmds/bootanimation/BootAnimation.h b/cmds/bootanimation/BootAnimation.h index 62da82f..fa908eb 100644 --- a/cmds/bootanimation/BootAnimation.h +++ b/cmds/bootanimation/BootAnimation.h @@ -70,6 +70,7 @@ private: int pause; String8 path; SortedVector<Frame> frames; + bool playUntilComplete; }; int fps; int width; @@ -82,6 +83,8 @@ private: bool android(); bool movie(); + void checkExit(); + sp<SurfaceComposerClient> mSession; AssetManager mAssets; Texture mAndroid[2]; |