commit 5185bc79b1d15f8db9e7cac202fae836ea4ce954
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Sep 12 16:58:21 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 12 16:58:21 2018 +0000
tree 2e53b55ee316fc7c3c061f388cbdfa47b576bf47
parent 09012c21b91be7403f142055739d41c9f897e08c
parent 43c815f5b1862d073522ae1e264a17e3155e6afb

Merge "MediaPlayer2: fix a regression from I5d4884353057a195b1f587694"

media/jni/android_media_MediaPlayer2.cpp

diff --git a/media/jni/android_media_MediaPlayer2.cpp b/media/jni/android_media_MediaPlayer2.cpp
index a2bf549..d4c84b5 100644
--- a/media/jni/android_media_MediaPlayer2.cpp
+++ b/media/jni/android_media_MediaPlayer2.cpp
@@ -1014,7 +1014,11 @@
     PlayerMessage response;
     request.ParseFromArray(pData, pDataLen);
 
-    media_player->invoke(request, &response);
+    process_media_player_call( env, thiz, media_player->invoke(request, &response),
+            "java.lang.RuntimeException", NULL );
+    if (env->ExceptionCheck()) {
+        return NULL;
+    }
 
     int size = response.ByteSize();
     jbyte* temp = new jbyte[size];