aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2010-06-23 17:47:34 -0700
committerXavier Ducrohet <xav@android.com>2010-06-23 17:47:34 -0700
commit0a2c7ef4fdc0e09a4d6f67e2b9670f2864688614 (patch)
treefeaa3d4b422f4c8f307b1f0a0d4aa6cac2e8a51a
parent64ca7d4faf4ce43f1ea490f80126d24b6d8b438d (diff)
downloadsdk-0a2c7ef4fdc0e09a4d6f67e2b9670f2864688614.zip
sdk-0a2c7ef4fdc0e09a4d6f67e2b9670f2864688614.tar.gz
sdk-0a2c7ef4fdc0e09a4d6f67e2b9670f2864688614.tar.bz2
Fix a crash in DDMS when parsing an unexpected sync event format due to a change in froyo.
Change-Id: I878911b3167ff12b48fa3ea3a7bfb9129466b9bd
-rw-r--r--ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/DisplaySyncPerf.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/DisplaySyncPerf.java b/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/DisplaySyncPerf.java
index 9ce7045..b484f26 100644
--- a/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/DisplaySyncPerf.java
+++ b/ddms/libs/ddmuilib/src/com/android/ddmuilib/log/event/DisplaySyncPerf.java
@@ -185,6 +185,9 @@ public class DisplaySyncPerf extends SyncCommon {
mTooltips[HTTP_NETWORK].add(tip);
mTooltips[HTTP_PROCESSING].add(tip);
}
+ } catch (NumberFormatException e) {
+ // This can happen when parsing events from froyo+ where the event with id 52000
+ // as a completely different format. For now, skip this event if this happens.
} catch (InvalidTypeException e) {
}
}