gltrace: Skip framebuffers that cannot be retrieved.

Rather than failing to parse the entire file, just ignore the
fb image if it can't be parsed. This should allow viewing the rest
of the data in the trace except for just the image.

Change-Id: I0d875cf45e09a29022b5b9a18d33601bb92225a5

1 files changed, 19 insertions, 2 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/ProtoBufUtils.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/ProtoBufUtils.java
index ed6a277..48cca87 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/ProtoBufUtils.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/ProtoBufUtils.java
@@ -16,6 +16,7 @@
 
 package com.android.ide.eclipse.gltrace;
 
+import com.android.ide.eclipse.gldebugger.GlTracePlugin;
 import com.android.ide.eclipse.gltrace.GLProtoBuf.GLMessage;
 
 import org.eclipse.swt.graphics.Image;
@@ -63,7 +64,15 @@ public class ProtoBufUtils {
             return null;
         }
 
-        ImageData imageData = getImageData(glMsg);
+        ImageData imageData = null;
+        try {
+            imageData = getImageData(glMsg);
+        } catch (Exception e) {
+            GlTracePlugin.getDefault().logMessage(
+                    "Unexpected error while retrieving framebuffer image: " + e);
+            return null;
+        }
+
         if (imageData == null) {
             return null;
         }
@@ -80,7 +89,15 @@ public class ProtoBufUtils {
             return null;
         }
 
-        ImageData imageData = getImageData(glMsg);
+        ImageData imageData = null;
+        try {
+            imageData = getImageData(glMsg);
+        } catch (Exception e) {
+            GlTracePlugin.getDefault().logMessage(
+                    "Unexpected error while retrieving framebuffer image: " + e);
+            return null;
+        }
+
         if (imageData == null) {
             return null;
         }