From f06c2bfc28eb354a1ad586cc57efcb68af272f6a Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 17 Dec 2012 11:08:27 +0100 Subject: [PATCH] Try to prevent OutOfMemoryException while loading contacts' picture --- src/org/linphone/compatibility/ApiFivePlus.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/org/linphone/compatibility/ApiFivePlus.java b/src/org/linphone/compatibility/ApiFivePlus.java index 9cd89f3cb..1a9e4f769 100644 --- a/src/org/linphone/compatibility/ApiFivePlus.java +++ b/src/org/linphone/compatibility/ApiFivePlus.java @@ -23,6 +23,7 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.database.MatrixCursor; +import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.net.Uri; import android.preference.CheckBoxPreference; @@ -274,7 +275,11 @@ public class ApiFivePlus { contact = new Contact(id, name); } else { - contact = new Contact(id, name, photo, BitmapFactory.decodeStream(input)); + Bitmap bm = null; + try { + bm = BitmapFactory.decodeStream(input); + } catch (OutOfMemoryError oome) {} + contact = new Contact(id, name, photo, bm); } return contact;