From 43c815f5b1862d073522ae1e264a17e3155e6afb Mon Sep 17 00:00:00 2001
From: Dongwon Kang <dwkang@google.com>
Date: Tue, 11 Sep 2018 17:48:38 -0700
Subject: [PATCH] MediaPlayer2: fix a regression from
 I5d4884353057a195b1f587694

Add a return value checking and throw an exception on error.

Test: pass MediaPlayer2Test#testDeselectTrackForSubtitleTracks
Bug: 63934228
Change-Id: I201af323792cbc8936ae9e763d5dd0143c81dfc6
---
 media/jni/android_media_MediaPlayer2.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/media/jni/android_media_MediaPlayer2.cpp b/media/jni/android_media_MediaPlayer2.cpp
index 801dade632681..d33f6db7faabf 100644
--- a/media/jni/android_media_MediaPlayer2.cpp
+++ b/media/jni/android_media_MediaPlayer2.cpp
@@ -1005,7 +1005,11 @@ android_media_MediaPlayer2_invoke(JNIEnv *env, jobject thiz, jbyteArray requestD
     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];