From bcaa4cd4f3be07f9211b51da4d258b61423f1e28 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 19 Feb 2013 16:26:52 +0000 Subject: [PATCH] sdremote: debugging to get a better handle on failed image allocations. --- .../impressremote/communication/SlideShow.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java b/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java index 2135dbfe9686..3925fe258fa7 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java +++ b/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java @@ -9,7 +9,9 @@ package org.libreoffice.impressremote.communication; import org.libreoffice.impressremote.R; +import org.libreoffice.impressremote.Globals; +import android.util.Log; import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -54,7 +56,14 @@ public class SlideShow { return BitmapFactory.decodeResource(mContext.getResources(), R.drawable.image_loading); } - Bitmap aBitmap = BitmapFactory.decodeByteArray(aImage, 0, aImage.length); + Bitmap aBitmap = null; + try { + aBitmap = BitmapFactory.decodeByteArray(aImage, 0, aImage.length); + } catch (OutOfMemoryError e) { + Log.e(Globals.TAG, "Bitmap decoding error byte length: " + aImage.length + + "first 4 bytes: " + aImage[0] + " " + aImage[1] + " " + aImage[2] + " " + aImage[3] + + "Exception " + e); + } if (aBitmap == null) { return BitmapFactory.decodeResource(mContext.getResources(), R.drawable.image_loading);