Adopt robolectric 3.6.1

Bug: 71596155 Test: make RunSettingsRoboTests Change-Id: I46362bae1e3ddd3ce19ade1c93250d272f3366e6
2018-01-11 18:07:54 -08:00
parent e9a3a14330
commit 99d10a4e62
8 changed files with 55 additions and 78 deletions
--- a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
+++ b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
@@ -190,8 +190,7 @@ public class XmlParserUtilTest {
            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
                    && type != XmlPullParser.START_TAG) {
            }
-            while (parser.getName() != xmlType) {
-                parser.next();
+            while (parser.getName() != xmlType && parser.next() != XmlPullParser.END_DOCUMENT) {
            }
        } catch (Exception e) {