Merge "Fix SettingsXml start tag logic" into sc-dev

2021-02-17 23:23:05 +00:00
parent cfbcacab0f ede1a4fc13
commit 61bd11c543
1 changed files with 4 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/SettingsXml.java
+++ b/services/core/java/com/android/server/pm/SettingsXml.java
@@ -181,7 +181,10 @@ public class SettingsXml {
        }

        private void moveToFirstTag() throws IOException, XmlPullParserException {
-            // Move to first tag
+            if (mParser.getEventType() == XmlPullParser.START_TAG) {
+                return;
+            }
+
            int type;
            //noinspection StatementWithEmptyBody
            while ((type = mParser.next()) != XmlPullParser.START_TAG