commit 322f13a8ffcee1a1c68ce712ccaeca9de5e6ca07
author Eric Laurent <elaurent@google.com> Tue Sep 27 01:35:43 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 27 01:35:43 2016 +0000
tree 27dc125eee0e543aa428de6b8f053b815e88bf97
parent 63bae5e61e9252ee9db3527d8dad99667eaed72e
parent 75bf3fd73b5a75698f41f1593e384a9a3a3afb74

DO NOT MERGE - fix truncated boot sound
am: 75bf3fd73b

Change-Id: I3394cdfc5878e1b3396a2858a40d4ddb0cda5b5c

cmds/bootanimation/Android.mk

diff --git a/cmds/bootanimation/Android.mk b/cmds/bootanimation/Android.mk
index 7c8842c..7f3fe22 100644
--- a/cmds/bootanimation/Android.mk
+++ b/cmds/bootanimation/Android.mk
@@ -23,7 +23,8 @@
     libEGL \
     libGLESv1_CM \
     libgui \
-    libtinyalsa
+    libtinyalsa \
+    libmedia
 
 LOCAL_MODULE:= bootanimation
 

cmds/bootanimation/AudioPlayer.cpp

diff --git a/cmds/bootanimation/AudioPlayer.cpp b/cmds/bootanimation/AudioPlayer.cpp
index 2932130..f5acac4 100644
--- a/cmds/bootanimation/AudioPlayer.cpp
+++ b/cmds/bootanimation/AudioPlayer.cpp
@@ -23,6 +23,7 @@
 #include <tinyalsa/asoundlib.h>
 #include <utils/Log.h>
 #include <utils/String8.h>
+#include <media/AudioSystem.h>
 
 #define ID_RIFF 0x46464952
 #define ID_WAVE 0x45564157
@@ -143,6 +144,9 @@
     struct mixer* mixer = NULL;
     char    name[MAX_LINE_LENGTH];
 
+    // Fake call to wait for audio HAL initialization completion
+    AudioSystem::getParameters(String8(""));
+
     for (;;) {
         const char* endl = strstr(config, "\n");
         if (!endl) break;