[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - android/sdremote

[Michael Meeks]

 android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java |   11 +++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 5c94a1ed371e140c91c0687acc719566055cca3e
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Feb 19 16:26:52 2013 +0000

    sdremote: debugging to get a better handle on failed image allocations.
    
    Change-Id: Ic6ea83338d1f821277d97ca368bb0b9f648eeb23
    Signed-off-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java b/android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
index 2135dbf..3925fe2 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);