summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorsundarajan srinivasan <ssrinivasan@cyngn.com>2016-01-27 14:48:47 -0800
committerSundarajan Srinivasan <ssrinivasan@cyngn.com>2016-02-15 14:15:40 -0800
commitae7aa13a7a424cf753e76bae8a4e43e5839aa990 (patch)
treec30e10ae3013e6b0cd4417a2eca1fbc5882e522c /cmds
parentdec301cac99341365d576ca803f7200a77eead80 (diff)
downloadframeworks_base-ae7aa13a7a424cf753e76bae8a4e43e5839aa990.zip
frameworks_base-ae7aa13a7a424cf753e76bae8a4e43e5839aa990.tar.gz
frameworks_base-ae7aa13a7a424cf753e76bae8a4e43e5839aa990.tar.bz2
bootanimation: Move the bootanimation playaudio code
Move the bootanimation playaudio code, so that the audio plays after the boot animation, because the audio manager is not ready and races with the boot animation, if they the audio and boot animation play together and makes the boot animation stutter. SAMOSA-10 Change-Id: I56ab19ec06a4af2de84916cdc330e646dd5a8695 (cherry picked from commit 9ccd025499bb36c27d1a9b0c5d20d1cc86beb167)
Diffstat (limited to 'cmds')
-rw-r--r--cmds/bootanimation/BootAnimation.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index b153454..b83c7ab 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -736,10 +736,6 @@ bool BootAnimation::movie()
pthread_mutex_init(&mp_lock, NULL);
pthread_cond_init(&mp_cond, NULL);
- property_get("persist.sys.silent", value, "null");
- if (strncmp(value, "1", 1) != 0) {
- playBackgroundMusic();
- }
for (size_t i=0 ; i<pcount ; i++) {
const Animation::Part& part(animation.parts[i]);
const size_t fcount = part.frames.size();
@@ -862,6 +858,12 @@ bool BootAnimation::movie()
}
+ property_get("persist.sys.silent", value, "null");
+ if (strncmp(value, "1", 1) != 0) {
+ ALOGD("playing boot audio here");
+ playBackgroundMusic();
+ }
+
if (isMPlayerPrepared) {
ALOGD("waiting for media player to complete.");
struct timespec timeout;