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

am 06169761: Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken

Browse Source
This commit is contained in:
Eric Laurent
2010-05-25 12:44:08 -07:00
committed by Android Git Automerger
parent 1a777cd44a 0616976128
commit e205dd34a5
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/libeffects/EffectEqualizer.cpp
View File

@@ -20,6 +20,7 @@
#include <cutils/log.h> #include <cutils/log.h>
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <new> #include <new>
#include "AudioEqualizer.h" #include "AudioEqualizer.h"
#include "AudioBiquadFilter.h" #include "AudioBiquadFilter.h"

4
media/libeffects/EffectsFactory.c
View File

@@ -18,6 +18,8 @@
//#define LOG_NDEBUG 0 //#define LOG_NDEBUG 0
#include "EffectsFactory.h" #include "EffectsFactory.h"
#include <string.h>
#include <stdlib.h>
#include <dlfcn.h> #include <dlfcn.h>
@@ -277,7 +279,7 @@ int EffectLoadLibrary(const char *libPath, int *handle)
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
if (libPath == NULL || strnlen(libPath, PATH_MAX) >= PATH_MAX) { if (libPath == NULL) {
return -EINVAL; return -EINVAL;
} }
return loadLibrary(libPath, handle); return loadLibrary(libPath, handle);