Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6cf559a authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Resolve XML parser used in tests. 

We recently pivoted the default XML parser to write a new binary
XML schema, which requires all users to "resolve" to determine the
correct parser.

Bug: 176037390
Test: atest WmTests:DisplayWindowSettingsProviderTests
Change-Id: I2077821f6812a33ff92c97f481b38d01c4ef7ae0
parent 612dbde3

services/tests/wmtests/src/com/android/server/wm/DisplayWindowSettingsProviderTests.java

+1 −2
Original line number Diff line number Diff line
@@ -312,8 +312,7 @@ public class DisplayWindowSettingsProviderTests extends WindowTestsBase { 
    private String getStoredDisplayAttributeValue(TestStorage storage, String attr)

            throws Exception {

        try (InputStream stream = storage.openRead()) {

            TypedXmlPullParser parser = Xml.newFastPullParser();

            parser.setInput(stream, StandardCharsets.UTF_8.name());

            TypedXmlPullParser parser = Xml.resolvePullParser(stream);

            int type;

            while ((type = parser.next()) != XmlPullParser.START_TAG

                    && type != XmlPullParser.END_DOCUMENT) {