commit d04e62fc3228c9369a3b2b69e4a0ba18911ee903
author Linux Build Service Account <lnxbuild@localhost> Tue Feb 16 22:24:39 2021 -0800
committer Linux Build Service Account <lnxbuild@localhost> Tue Feb 16 22:24:39 2021 -0800
tree d7556a542ca28eee932a91cea3c92fd4f07bd539
parent e07f6b99c57c29e646cd0f4549da7b2690424b49
parent b094d1e8af0bcab0405e1f397a45777888cb3d86

Merge b094d1e8af0bcab0405e1f397a45777888cb3d86 on remote branch

Change-Id: Iefc827e85feeaf940f4f6d34e5da8d89ac67cc05

src/com/android/media/tests/CameraPerformanceTest.java

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);
             }
         }