am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" (0ddcc8bc) · Commits · e / os / android_frameworks_base

media/java/android/media/ThumbnailUtils.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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);
	}		}
	}		}