Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 613dc4cc authored by Wei Jia's avatar Wei Jia Committed by android-build-merger
Browse files

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

am: c4e8471b

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

Change-Id: Id138df3cfe1ee989d4abf52ae283b63419e7047a
parents d91b14d8 c4e8471b

media/jni/android_media_MediaSync.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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());