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

am: 68e8d86b02

* commit '68e8d86b02c99d1d1e81816189d46dc757e08dbf':
  android_media_MediaSync: Do not pass NULL to AString ctor.

Change-Id: I363fa893c1e895168c9a41293a167f606f289c2e
This commit is contained in:
Wei Jia
2016-05-17 21:49:21 +00:00
committed by android-build-merger

View File

@@ -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());