commit cc4fc7f79614498bdcdad452c11042ff7c64ac72
author gitbuildkicker <android-build@google.com> Thu Oct 13 00:06:33 2016 -0700
committer gitbuildkicker <android-build@google.com> Thu Oct 13 00:06:33 2016 -0700
tree 677d5e6b6bdcd8e81c22635e04e8ddda74a9b0d1
parent fa7e928944e7db84c2e85266bf170c29972b47b9
parent 39cad4532f16ebadc812c10190379be3cc4ba87d

merge in nyc-mr1-release history after reset to nyc-mr1-dev

visualizer/offload_visualizer.c

diff --git a/visualizer/offload_visualizer.c b/visualizer/offload_visualizer.c
index 69cea57..c56ebff 100644
--- a/visualizer/offload_visualizer.c
+++ b/visualizer/offload_visualizer.c
@@ -869,9 +869,13 @@
     case VISUALIZER_CMD_MEASURE: {
         if (pReplyData == NULL || replySize == NULL ||
                 *replySize < (sizeof(int32_t) * MEASUREMENT_COUNT)) {
-            ALOGV("%s VISUALIZER_CMD_MEASURE error *replySize %d <"
-                    "(sizeof(int32_t) * MEASUREMENT_COUNT) %d",
-                    __func__, *replySize, sizeof(int32_t) * MEASUREMENT_COUNT);
+            if (replySize == NULL) {
+                ALOGV("%s VISUALIZER_CMD_MEASURE error replySize NULL", __func__);
+            } else {
+                ALOGV("%s VISUALIZER_CMD_MEASURE error *replySize %u <"
+                        "(sizeof(int32_t) * MEASUREMENT_COUNT) %zu",
+                        __func__, *replySize, sizeof(int32_t) * MEASUREMENT_COUNT);
+            }
             android_errorWriteLog(0x534e4554, "30229821");
             return -EINVAL;
         }