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

am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"

Browse Source 
* commit 'b618b2ef8722964730d09a86a06a85ca34df6de4':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
This commit is contained in:
Brad Fitzpatrick
2011-03-30 08:20:58 -07:00
committed by Android Git Automerger
parent f68098534e b618b2ef87
commit 0ddcc8bc60
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/ThumbnailUtils.java
View File

@@ -83,7 +83,7 @@ public class ThumbnailUtils {
* *
* @param filePath the path of image file * @param filePath the path of image file
* @param kind could be MINI_KIND or MICRO_KIND * @param kind could be MINI_KIND or MICRO_KIND
* @return Bitmap * @return Bitmap, or null on failures
* *
* @hide This method is only used by media framework and media provider internally. * @hide This method is only used by media framework and media provider internally.
*/ */
@@ -123,6 +123,8 @@ public class ThumbnailUtils {
bitmap = BitmapFactory.decodeFileDescriptor(fd, null, options); bitmap = BitmapFactory.decodeFileDescriptor(fd, null, options);
} catch (IOException ex) { } catch (IOException ex) {
Log.e(TAG, "", ex); Log.e(TAG, "", ex);
} catch (OutOfMemoryError oom) {
Log.e(TAG, "Unable to decode file " + filePath + ". OutOfMemoryError.", oom);
} }
} }