Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev

2016-05-17 21:17:36 +00:00
parent 8802fd0700 838a4ed101
commit c4e8471ba4
1 changed files with 1 additions and 1 deletions
--- 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());