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

am 68bf6eb4: am d6904819: Merge "Throw an exception instead of crash when a surface does not have a binding surface texture" into jb-mr1-dev

Browse Source 
* commit '68bf6eb411afff2f3233ce7447914b34af6b1b96':
  Throw an exception instead of crash when a surface does not have a binding surface texture
This commit is contained in:
James Dong
2012-10-04 15:27:44 -07:00
committed by Android Git Automerger
parent 61f6185aba 68bf6eb411
commit f4e2d378a7
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/jni/android_media_MediaPlayer.cpp
View File

@@ -274,6 +274,11 @@ setVideoSurface(JNIEnv *env, jobject thiz, jobject jsurface, jboolean mediaPlaye
sp<Surface> surface(android_view_Surface_getSurface(env, jsurface)); sp<Surface> surface(android_view_Surface_getSurface(env, jsurface));
if (surface != NULL) { if (surface != NULL) {
new_st = surface->getSurfaceTexture(); new_st = surface->getSurfaceTexture();
if (new_st == NULL) {
jniThrowException(env, "java/lang/IllegalArgumentException",
"The surface does not have a binding SurfaceTexture!");
return;
}
new_st->incStrong(thiz); new_st->incStrong(thiz);
} else { } else {
jniThrowException(env, "java/lang/IllegalArgumentException", jniThrowException(env, "java/lang/IllegalArgumentException",