resolved conflicts for merge of 732140ce to master (87d78b55) · Commits · e / os / android_frameworks_base

core/java/android/content/AbstractTableMerger.java

+26 −23

Original line number	Diff line number	Diff line
		@@ -369,10 +369,8 @@ public abstract class AbstractTableMerger
		// An existing server item has changed
		// If serverSyncVersion is null, there is no edit URL;
		// server won't let this change be written.
		// Just hold onto it, I guess, in case the server permissions
		// change later.
		if (serverSyncVersion != null) {
		boolean recordChanged = (localSyncVersion == null) \|\|
		(serverSyncVersion == null) \|\|
		!serverSyncVersion.equals(localSyncVersion);
		if (recordChanged) {
		if (localSyncDirty) {
		@@ -393,6 +391,11 @@ public abstract class AbstractTableMerger
		}
		update = true;
		}
		} else {
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		Log.v(TAG,
		"Skipping update: localSyncVersion: " + localSyncVersion +
		", serverSyncVersion: " + serverSyncVersion);
		}
		}
		} else {