From ede1a4fc13c4c8096882c33fa0f6b015ebd64d2c Mon Sep 17 00:00:00 2001 From: Winson Date: Wed, 17 Feb 2021 13:09:23 -0800 Subject: [PATCH] Fix SettingsXml start tag logic Don't move to next tag if the current tag is the START_TAG. The initial implementation assumed domain verification state would write to a new XML file, but it ended up being stuffed into packages.xml, so the start tag is already read in the initial switch that calls into DomainVerificationService. Bug: 180527086 Test: atest DomainVerificationPersistenceTest Change-Id: I623afb08985bf5377cb9ae240805aae5db9cd820 --- services/core/java/com/android/server/pm/SettingsXml.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/SettingsXml.java b/services/core/java/com/android/server/pm/SettingsXml.java index 9588a279ececf..ec643f5980417 100644 --- 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