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

Merge "Fix for native crash on image decode OOM" into jb-mr1-dev

Browse Source
This commit is contained in:
Raph Levien
2012-09-20 23:25:26 -07:00
committed by Android (Google) Code Review
parent 74defbf202 005bfc694d
commit 3034d45104
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android/graphics/BitmapFactory.cpp
View File

@@ -340,7 +340,9 @@ static jobject doDecode(JNIEnv* env, SkStream* stream, jobject padding,
bitmap->setConfig(config, scaledWidth, scaledHeight); bitmap->setConfig(config, scaledWidth, scaledHeight);
bitmap->setIsOpaque(decoded->isOpaque()); bitmap->setIsOpaque(decoded->isOpaque());
bitmap->allocPixels(&javaAllocator, NULL); if (!bitmap->allocPixels(&javaAllocator, NULL)) {
return nullObjectReturn("allocation failed for scaled bitmap");
}
bitmap->eraseColor(0); bitmap->eraseColor(0);
SkPaint paint; SkPaint paint;