From 838a4ed101ef46ecd707087bee68ed19f87c6cc8 Mon Sep 17 00:00:00 2001
From: Wei Jia <wjia@google.com>
Date: Mon, 16 May 2016 17:40:02 -0700
Subject: [PATCH] android_media_MediaSync: Do not pass NULL to AString ctor.

Bug: 28643582
Change-Id: I75eaf61007adffdd7e3b07aebb37c12a8e71cf75
---
 media/jni/android_media_MediaSync.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/jni/android_media_MediaSync.cpp b/media/jni/android_media_MediaSync.cpp
index 893c41472e072..6de5ea9e9f668 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());