diff options
| author | Eric Laurent <elaurent@google.com> | 2010-05-25 12:44:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-25 12:44:08 -0700 |
| commit | e205dd34a52a05b5037dfb8979190b234d5557dd (patch) | |
| tree | e735d36713cadabd068fd9161d5ed6f0767bb6d9 | |
| parent | 1a777cd44a73571ab8040191348d1601585c3f90 (diff) | |
| parent | 0616976128b9bc24729a79034c3902492dc9e573 (diff) | |
| download | frameworks_base-e205dd34a52a05b5037dfb8979190b234d5557dd.zip frameworks_base-e205dd34a52a05b5037dfb8979190b234d5557dd.tar.gz frameworks_base-e205dd34a52a05b5037dfb8979190b234d5557dd.tar.bz2 | |
am 06169761: Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken
| -rw-r--r-- | media/libeffects/EffectEqualizer.cpp | 1 | ||||
| -rw-r--r-- | media/libeffects/EffectsFactory.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/media/libeffects/EffectEqualizer.cpp b/media/libeffects/EffectEqualizer.cpp index 3a5da4d..c08f4f5 100644 --- a/media/libeffects/EffectEqualizer.cpp +++ b/media/libeffects/EffectEqualizer.cpp @@ -20,6 +20,7 @@ #include <cutils/log.h> #include <assert.h> #include <stdlib.h> +#include <string.h> #include <new> #include "AudioEqualizer.h" #include "AudioBiquadFilter.h" diff --git a/media/libeffects/EffectsFactory.c b/media/libeffects/EffectsFactory.c index 07c4d80..35a1001 100644 --- a/media/libeffects/EffectsFactory.c +++ b/media/libeffects/EffectsFactory.c @@ -18,6 +18,8 @@ //#define LOG_NDEBUG 0 #include "EffectsFactory.h" +#include <string.h> +#include <stdlib.h> #include <dlfcn.h> @@ -277,7 +279,7 @@ int EffectLoadLibrary(const char *libPath, int *handle) if (ret < 0) { return ret; } - if (libPath == NULL || strnlen(libPath, PATH_MAX) >= PATH_MAX) { + if (libPath == NULL) { return -EINVAL; } return loadLibrary(libPath, handle); |