summaryrefslogtreecommitdiff
path: root/cmds/bootanimation/BootAnimation.h
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-01-29 11:45:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-01-29 11:45:11 +0000
commitd7c39e5ca969d8c4e1e438cd9768d3628a9919c9 (patch)
tree8e8a3c8b2799b52b07100cf24b89586e804f41f3 /cmds/bootanimation/BootAnimation.h
parentb087e5b202e17b4c82f5006ae4acfa234bbefc8c (diff)
parentab74c5633ab22414c709e47f17c3a2c4dbc43c22 (diff)
Merge "Add a way to customize boot animation during userspace reboot" am: 3d0bb1d650 am: ab74c5633a
Change-Id: I97f0d2fed9cfc3f444a7deeac9a4ca13293b66b5
Diffstat (limited to 'cmds/bootanimation/BootAnimation.h')
-rw-r--r--cmds/bootanimation/BootAnimation.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmds/bootanimation/BootAnimation.h b/cmds/bootanimation/BootAnimation.h
index dc19fb09ef1d..574d65e425cf 100644
--- a/cmds/bootanimation/BootAnimation.h
+++ b/cmds/bootanimation/BootAnimation.h
@@ -17,6 +17,8 @@
#ifndef ANDROID_BOOTANIMATION_H
#define ANDROID_BOOTANIMATION_H
+#include <vector>
+
#include <stdint.h>
#include <sys/types.h>
@@ -157,6 +159,7 @@ private:
bool parseAnimationDesc(Animation&);
bool preloadZip(Animation &animation);
void findBootAnimationFile();
+ bool findBootAnimationFileInternal(const std::vector<std::string>& files);
bool preloadAnimation();
void checkExit();