Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 7948 into donut

Browse Source 
* changes:
  Fix updates from read-only calendar.
This commit is contained in:
Android (Google) Code Review
2009-07-20 16:22:47 -07:00
parent 592f1a6581 c1f2836796
commit 732140cefa
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/content/AbstractTableMerger.java
View File

@@ -369,10 +369,8 @@ public abstract class AbstractTableMerger
// An existing server item has changed // An existing server item has changed
// If serverSyncVersion is null, there is no edit URL; // If serverSyncVersion is null, there is no edit URL;
// server won't let this change be written. // 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) || boolean recordChanged = (localSyncVersion == null) ||
(serverSyncVersion == null) ||
!serverSyncVersion.equals(localSyncVersion); !serverSyncVersion.equals(localSyncVersion);
if (recordChanged) { if (recordChanged) {
if (localSyncDirty) { if (localSyncDirty) {
@@ -393,6 +391,11 @@ public abstract class AbstractTableMerger
} }
update = true; update = true;
} }
} else {
if (Log.isLoggable(TAG, Log.VERBOSE)) {
Log.v(TAG,
"Skipping update: localSyncVersion: " + localSyncVersion +
", serverSyncVersion: " + serverSyncVersion);
} }
} }
} else { } else {