drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."

Browse Source 
* commit 'ab962b54e3eac4ffadb5ea4e4948df10e6201468':
  MetadataRetriever: Check null pointer to avoid tombstone crash.
This commit is contained in:
Marco Nelissen
2014-05-01 15:32:17 +00:00
committed by Android Git Automerger
parent 531381056f ab962b54e3
commit 4375e84882
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/jni/android_media_MediaMetadataRetriever.cpp
View File

@ -262,6 +262,13 @@ static jobject android_media_MediaMetadataRetriever_getFrameAtTime(JNIEnv *env,
width,
height,
config);
if (jBitmap == NULL) {
if (env->ExceptionCheck()) {
env->ExceptionClear();
}
ALOGE("getFrameAtTime: create Bitmap failed!");
return NULL;
}
SkBitmap *bitmap =
(SkBitmap *) env->GetLongField(jBitmap, fields.nativeBitmap);