diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-13 02:14:22 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-13 02:14:22 +0100 |
| commit | e9c0ba1859c0f5890fed280e03d0328311234cce (patch) | |
| tree | 2e3f9f21e918c80cd3671eb0dc568b894fe66ae5 /media/libeffects/visualizer | |
| parent | e15fd68c5dc4089690b5d3086776c3851e504bb7 (diff) | |
| parent | fd66f406edcb6c20558073ee4f5a0aa5f994716e (diff) | |
| download | frameworks_av-e9c0ba1859c0f5890fed280e03d0328311234cce.zip frameworks_av-e9c0ba1859c0f5890fed280e03d0328311234cce.tar.gz frameworks_av-e9c0ba1859c0f5890fed280e03d0328311234cce.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_av into replicant-6.0
Diffstat (limited to 'media/libeffects/visualizer')
| -rw-r--r-- | media/libeffects/visualizer/EffectVisualizer.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/media/libeffects/visualizer/EffectVisualizer.cpp b/media/libeffects/visualizer/EffectVisualizer.cpp index 91f9fc7..21fddb1 100644 --- a/media/libeffects/visualizer/EffectVisualizer.cpp +++ b/media/libeffects/visualizer/EffectVisualizer.cpp @@ -602,9 +602,14 @@ int Visualizer_command(effect_handle_t self, uint32_t cmdCode, uint32_t cmdSize, case VISUALIZER_CMD_MEASURE: { if (pReplyData == NULL || replySize == NULL || *replySize < (sizeof(int32_t) * MEASUREMENT_COUNT)) { - ALOGV("VISUALIZER_CMD_MEASURE() error *replySize %" PRIu32 - " < (sizeof(int32_t) * MEASUREMENT_COUNT) %" PRIu32, *replySize, - sizeof(int32_t) * MEASUREMENT_COUNT); + if (replySize == NULL) { + ALOGV("VISUALIZER_CMD_MEASURE() error replySize NULL"); + } else { + ALOGV("VISUALIZER_CMD_MEASURE() error *replySize %" PRIu32 + " < (sizeof(int32_t) * MEASUREMENT_COUNT) %" PRIu32, + *replySize, + uint32_t(sizeof(int32_t)) * MEASUREMENT_COUNT); + } android_errorWriteLog(0x534e4554, "30229821"); return -EINVAL; } |