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

am: 613dc4cc1d

* commit '613dc4cc1d902aa9f4ac5a0db375c6e9972ec256':
  android_media_MediaSync: Do not pass NULL to AString ctor.

Change-Id: I412def216bdb52238b560b0e575ff629473cc0a6
This commit is contained in:
Wei Jia
2016-05-17 21:45:27 +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());