Merge "Fix a regression in settings parsing" (0cd50c51) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1806,7 +1806,7 @@ public class SettingsProvider extends ContentProvider {
		final int oldVersion = secureSettings.getVersionLocked();
		final int newVersion = SETTINGS_VERSION;

		// If up do data - done.
		// If up do date - done.
		if (oldVersion == newVersion) {
		return;
		}

+14 −8

Original line number	Diff line number	Diff line
		@@ -433,6 +433,9 @@ final class SettingsState {

		private void parseSettingsLocked(XmlPullParser parser)
		throws IOException, XmlPullParserException {

		mVersion = Integer.parseInt(parser.getAttributeValue(null, ATTR_VERSION));

		final int outerDepth = parser.getDepth();
		int type;
		while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
		@@ -441,6 +444,8 @@ final class SettingsState {
		continue;
		}

		String tagName = parser.getName();
		if (tagName.equals(TAG_SETTING)) {
		String id = parser.getAttributeValue(null, ATTR_ID);
		String name = parser.getAttributeValue(null, ATTR_NAME);
		String value = parser.getAttributeValue(null, ATTR_VALUE);
		@@ -453,6 +458,7 @@ final class SettingsState {
		}
		}
		}
		}

		private final class MyHandler extends Handler {
		public static final int MSG_PERSIST_SETTINGS = 1;