Snap for 6695198 from 53522f0bcf9421388b3968e7d7c20681f01b8a23 to rvc-d1-releaseandroid-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-release

Change-Id: I5f88df9344e171f9dd0ce0b768fc0b782ba44ecd

1 files changed, 8 insertions, 5 deletions

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 @@ public class CameraPerformanceTest extends CameraTestBase {
             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);
             }
         }