Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE - fix truncated boot sound" into nyc-dev

Browse Source
This commit is contained in:
Eric Laurent
2016-09-27 01:26:05 +00:00
committed by Android (Google) Code Review
parent ade93296ff 75bf3fd73b
commit a15c471ee5
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmds/bootanimation/Android.mk
View File

@@ -23,7 +23,8 @@ LOCAL_SHARED_LIBRARIES := \
libEGL \ libEGL \
libGLESv1_CM \ libGLESv1_CM \
libgui \ libgui \
libtinyalsa libtinyalsa \
libmedia
LOCAL_MODULE:= bootanimation LOCAL_MODULE:= bootanimation

4
cmds/bootanimation/AudioPlayer.cpp
View File

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