Merge "Add a missing write lock to settings state." (986a04f2) · Commits · e / os / android_frameworks_base

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

+52 −46

Original line number	Diff line number	Diff line
		@@ -143,6 +143,8 @@ final class SettingsState {
		@GuardedBy("sLock")
		private static Signature sSystemSignature;

		private final Object mWriteLock = new Object();

		private final Object mLock;

		private final Handler mHandler;
		@@ -551,6 +553,7 @@ final class SettingsState {
		}

		private void doWriteState() {
		synchronized (mWriteLock) {
		if (DEBUG_PERSISTENCE) {
		Slog.i(LOG_TAG, "[PERSIST START]");
		}
		@@ -573,7 +576,8 @@ final class SettingsState {

		XmlSerializer serializer = Xml.newSerializer();
		serializer.setOutput(out, StandardCharsets.UTF_8.name());
		serializer.setFeature("http://xmlpull.org/v1/doc/features.html#indent-output", true);
		serializer.setFeature("http://xmlpull.org/v1/doc/features.html#indent-output",
		true);
		serializer.startDocument(null, true);
		serializer.startTag(null, TAG_SETTINGS);
		serializer.attribute(null, ATTR_VERSION, String.valueOf(version));
		@@ -587,7 +591,8 @@ final class SettingsState {
		setting.getTag(), setting.isDefaultFromSystem());

		if (DEBUG_PERSISTENCE) {
		Slog.i(LOG_TAG, "[PERSISTED]" + setting.getName() + "=" + setting.getValue());
		Slog.i(LOG_TAG, "[PERSISTED]" + setting.getName() + "="
		+ setting.getValue());
		}
		}

		@@ -609,6 +614,7 @@ final class SettingsState {
		IoUtils.closeQuietly(out);
		}
		}
		}

		static void writeSingleSetting(int version, XmlSerializer serializer, String id,
		String name, String value, String defaultValue, String packageName,