diff options
| author | Joseph Wen <josephwen@google.com> | 2010-09-10 02:35:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 02:35:50 -0700 |
| commit | 94db0238a3b6cba3cbf0e037af74e898a4741204 (patch) | |
| tree | 2822f8caacf52706f56d9c6744ee5ae7c601179c /graphics | |
| parent | 5f93c39cdb2f75dda805691987ccd4e570f6cb74 (diff) | |
| parent | 219eb7ec8403ef9b98125f2b58cc27669ae69712 (diff) | |
| download | frameworks_base-94db0238a3b6cba3cbf0e037af74e898a4741204.zip frameworks_base-94db0238a3b6cba3cbf0e037af74e898a4741204.tar.gz frameworks_base-94db0238a3b6cba3cbf0e037af74e898a4741204.tar.bz2 | |
am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbread
Merge commit '219eb7ec8403ef9b98125f2b58cc27669ae69712' into gingerbread-plus-aosp
* commit '219eb7ec8403ef9b98125f2b58cc27669ae69712':
Fix bug in JNI BitmapFactory
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/BitmapFactory.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java index 02e16cd..6234f2c 100644 --- a/graphics/java/android/graphics/BitmapFactory.java +++ b/graphics/java/android/graphics/BitmapFactory.java @@ -628,12 +628,6 @@ public class BitmapFactory { */ public static LargeBitmap createLargeBitmap( FileDescriptor fd, boolean isShareable) throws IOException { - if (MemoryFile.isMemoryFile(fd)) { - int mappedlength = MemoryFile.getSize(fd); - MemoryFile file = new MemoryFile(fd, mappedlength, "r"); - InputStream is = file.getInputStream(); - return createLargeBitmap(is, isShareable); - } return nativeCreateLargeBitmap(fd, isShareable); } |