summaryrefslogtreecommitdiff
path: root/media/jni/android_media_MediaSync.cpp
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2016-05-16 17:40:02 -0700
committerWei Jia <wjia@google.com>2016-05-16 17:40:02 -0700
commit838a4ed101ef46ecd707087bee68ed19f87c6cc8 (patch)
tree72e91a2e70f13dffe7de62ba3ce0f394a28a0c2d /media/jni/android_media_MediaSync.cpp
parent8e30eb3a7f81729065bad6d971bf414f995410df (diff)
android_media_MediaSync: Do not pass NULL to AString ctor.
Bug: 28643582 Change-Id: I75eaf61007adffdd7e3b07aebb37c12a8e71cf75
Diffstat (limited to 'media/jni/android_media_MediaSync.cpp')
-rw-r--r--media/jni/android_media_MediaSync.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaSync.cpp b/media/jni/android_media_MediaSync.cpp
index 893c41472e07..6de5ea9e9f66 100644
--- a/media/jni/android_media_MediaSync.cpp
+++ b/media/jni/android_media_MediaSync.cpp
@@ -159,7 +159,7 @@ static void throwExceptionAsNecessary(
if (err > 0) {
break;
}
- AString msgWithErrorCode(msg);
+ AString msgWithErrorCode(msg == NULL ? "" : msg);
msgWithErrorCode.append(" error:");
msgWithErrorCode.append(err);
jniThrowException(env, "java/lang/IllegalStateException", msgWithErrorCode.c_str());