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

am: 8a53cc9e26

* commit '8a53cc9e267d88f013402ea246ca507c494ccea4':
  android_media_MediaSync: Do not pass NULL to AString ctor.

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

View File

@@ -159,7 +159,7 @@ static void throwExceptionAsNecessary(
if (err > 0) { if (err > 0) {
break; break;
} }
AString msgWithErrorCode(msg); AString msgWithErrorCode(msg == NULL ? "" : msg);
msgWithErrorCode.append(" error:"); msgWithErrorCode.append(" error:");
msgWithErrorCode.append(err); msgWithErrorCode.append(err);
jniThrowException(env, "java/lang/IllegalStateException", msgWithErrorCode.c_str()); jniThrowException(env, "java/lang/IllegalStateException", msgWithErrorCode.c_str());