mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sdremote: debugging to get a better handle on failed image allocations.

Browse Source
This commit is contained in:
Michael Meeks 2013-02-19 16:26:52 +00:00
parent 49db90342f
commit bcaa4cd4f3
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java
View File

@ -9,7 +9,9 @@
package org.libreoffice.impressremote.communication; package org.libreoffice.impressremote.communication;
import org.libreoffice.impressremote.R; import org.libreoffice.impressremote.R;
import org.libreoffice.impressremote.Globals;
import android.util.Log;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
@ -54,7 +56,14 @@ public class SlideShow {
return BitmapFactory.decodeResource(mContext.getResources(), return BitmapFactory.decodeResource(mContext.getResources(),
R.drawable.image_loading); 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) { if (aBitmap == null) {
return BitmapFactory.decodeResource(mContext.getResources(), return BitmapFactory.decodeResource(mContext.getResources(),
R.drawable.image_loading); R.drawable.image_loading);