Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: c4e8471ba4

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

Change-Id: I1b883f4fe46ebb150841f5a75517a8340597edba
This commit is contained in:
Wei Jia
2016-05-17 21:39:05 +00:00
committed by android-build-merger
parent efc9c88d00 c4e8471ba4
commit 8a53cc9e26
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/jni/android_media_MediaSync.cpp
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());