From c6cf559a59b7802cbce7d8acdd482cf885699561 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Sun, 20 Dec 2020 19:27:04 -0700
Subject: [PATCH] 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
---
 .../android/server/wm/DisplayWindowSettingsProviderTests.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayWindowSettingsProviderTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayWindowSettingsProviderTests.java
index 7c4f7db48022d..33e8fc0bd94b0 100644
--- a/services/tests/wmtests/src/com/android/server/wm/DisplayWindowSettingsProviderTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/DisplayWindowSettingsProviderTests.java
@@ -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) {