Merge b094d1e8af0bcab0405e1f397a45777888cb3d86 on remote branch
Change-Id: Iefc827e85feeaf940f4f6d34e5da8d89ac67cc05
diff --git a/src/com/android/media/tests/CameraPerformanceTest.java b/src/com/android/media/tests/CameraPerformanceTest.java
index 306c212..b3fefcc 100644
--- a/src/com/android/media/tests/CameraPerformanceTest.java
+++ b/src/com/android/media/tests/CameraPerformanceTest.java
@@ -463,12 +463,15 @@
setSummary(parseToCtsMetrics(parser));
parser.nextTag();
parser.require(XmlPullParser.END_TAG, null, SUMMARY_TAG);
- parser.nextTag();
- if (parser.getName().equals(DETAIL_TAG)) {
- while (parser.nextTag() == XmlPullParser.START_TAG) {
- addDetail(parseToCtsMetrics(parser));
+ parser.next();
+ int eventType = parser.getEventType();
+ if (eventType != XmlPullParser.END_DOCUMENT) {
+ if (parser.getName().equals(DETAIL_TAG)) {
+ while (parser.nextTag() == XmlPullParser.START_TAG) {
+ addDetail(parseToCtsMetrics(parser));
+ }
+ parser.require(XmlPullParser.END_TAG, null, DETAIL_TAG);
}
- parser.require(XmlPullParser.END_TAG, null, DETAIL_TAG);
}
}