diff options
| author | Ken Shirriff <kens@google.com> | 2009-07-20 21:30:46 -0700 |
|---|---|---|
| committer | Ken Shirriff <kens@google.com> | 2009-07-20 21:30:46 -0700 |
| commit | 87d78b55095312bd7c8c5ce78d7e7bf142a89adb (patch) | |
| tree | 941fbd9c9393a44e7dd171b25d18c52fc7e1e4b3 /core/java/android/content/AbstractTableMerger.java | |
| parent | 2f140bdb8a22a6328023a5cd7d19ecd57e6662d9 (diff) | |
| parent | 732140cefadaf32eed83706c69eabbfee9e054ee (diff) | |
| download | frameworks_base-87d78b55095312bd7c8c5ce78d7e7bf142a89adb.zip frameworks_base-87d78b55095312bd7c8c5ce78d7e7bf142a89adb.tar.gz frameworks_base-87d78b55095312bd7c8c5ce78d7e7bf142a89adb.tar.bz2 | |
resolved conflicts for merge of 732140ce to master
Diffstat (limited to 'core/java/android/content/AbstractTableMerger.java')
| -rw-r--r-- | core/java/android/content/AbstractTableMerger.java | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/core/java/android/content/AbstractTableMerger.java b/core/java/android/content/AbstractTableMerger.java index 3266c07..a3daa01 100644 --- a/core/java/android/content/AbstractTableMerger.java +++ b/core/java/android/content/AbstractTableMerger.java @@ -369,30 +369,33 @@ 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.equals(localSyncVersion); - if (recordChanged) { - if (localSyncDirty) { - if (Log.isLoggable(TAG, Log.VERBOSE)) { - Log.v(TAG, "remote record " + serverSyncId - + " conflicts with local _sync_id " + localSyncID - + ", local _id " + localRowId); - } - conflict = true; - } else { - if (Log.isLoggable(TAG, Log.VERBOSE)) { - Log.v(TAG, - "remote record " + - serverSyncId + - " updates local _sync_id " + - localSyncID + ", local _id " + - localRowId); - } - update = true; + boolean recordChanged = (localSyncVersion == null) || + (serverSyncVersion == null) || + !serverSyncVersion.equals(localSyncVersion); + if (recordChanged) { + if (localSyncDirty) { + if (Log.isLoggable(TAG, Log.VERBOSE)) { + Log.v(TAG, "remote record " + serverSyncId + + " conflicts with local _sync_id " + localSyncID + + ", local _id " + localRowId); } + conflict = true; + } else { + if (Log.isLoggable(TAG, Log.VERBOSE)) { + Log.v(TAG, + "remote record " + + serverSyncId + + " updates local _sync_id " + + localSyncID + ", local _id " + + localRowId); + } + update = true; + } + } else { + if (Log.isLoggable(TAG, Log.VERBOSE)) { + Log.v(TAG, + "Skipping update: localSyncVersion: " + localSyncVersion + + ", serverSyncVersion: " + serverSyncVersion); } } } else { |