commit 838a4ed101ef46ecd707087bee68ed19f87c6cc8
author Wei Jia <wjia@google.com> Mon May 16 17:40:02 2016 -0700
committer Wei Jia <wjia@google.com> Mon May 16 17:40:02 2016 -0700
tree 72e91a2e70f13dffe7de62ba3ce0f394a28a0c2d
parent 8e30eb3a7f81729065bad6d971bf414f995410df

android_media_MediaSync: Do not pass NULL to AString ctor.

Bug: 28643582
Change-Id: I75eaf61007adffdd7e3b07aebb37c12a8e71cf75

media/jni/android_media_MediaSync.cpp

diff --git a/media/jni/android_media_MediaSync.cpp b/media/jni/android_media_MediaSync.cpp
index 893c414..6de5ea9 100644
--- a/media/jni/android_media_MediaSync.cpp
+++ b/media/jni/android_media_MediaSync.cpp
@@ -159,7 +159,7 @@
             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());