Merge "Avoid cross lock acquisition leading to deadlocks" (fe473986) · Commits · e / os / android_frameworks_base

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

+18 −14

Original line number	Diff line number	Diff line
		@@ -553,13 +553,7 @@ final class SettingsState {
		}

		private void doWriteState() {
		synchronized (mWriteLock) {
		if (DEBUG_PERSISTENCE) {
		Slog.i(LOG_TAG, "[PERSIST START]");
		}

		AtomicFile destination = new AtomicFile(mStatePersistFile);

		boolean wroteState = false;
		final int version;
		final ArrayMap<String, Setting> settings;

		@@ -570,6 +564,12 @@ final class SettingsState {
		mWriteScheduled = false;
		}

		synchronized (mWriteLock) {
		if (DEBUG_PERSISTENCE) {
		Slog.i(LOG_TAG, "[PERSIST START]");
		}

		AtomicFile destination = new AtomicFile(mStatePersistFile);
		FileOutputStream out = null;
		try {
		out = destination.startWrite();
		@@ -600,9 +600,7 @@ final class SettingsState {
		serializer.endDocument();
		destination.finishWrite(out);

		synchronized (mLock) {
		addHistoricalOperationLocked(HISTORICAL_OPERATION_PERSIST, null);
		}
		wroteState = true;

		if (DEBUG_PERSISTENCE) {
		Slog.i(LOG_TAG, "[PERSIST END]");
		@@ -614,6 +612,12 @@ final class SettingsState {
		IoUtils.closeQuietly(out);
		}
		}

		if (wroteState) {
		synchronized (mLock) {
		addHistoricalOperationLocked(HISTORICAL_OPERATION_PERSIST, null);
		}
		}
		}

		static void writeSingleSetting(int version, XmlSerializer serializer, String id,