Bug 1046709 - Post: remove dead code r=nalexander,rnewman draft
authorGrigory Kruglov <gkruglov@mozilla.com>
Thu, 07 Apr 2016 19:08:42 -0400
changeset 353768 93e625c9c2ef9611e29004e9670aca15b97a6faa
parent 353767 df749bc66779f371907f63fe22b5bdf835fee41a
child 353770 94a375f060be0bd2625126a8a0a48028687d4f67
push id15929
push usergkruglov@mozilla.com
push dateTue, 19 Apr 2016 19:45:51 +0000
reviewersnalexander, rnewman
bugs1046709
milestone48.0a1
Bug 1046709 - Post: remove dead code r=nalexander,rnewman MozReview-Commit-ID: K75KTg6pDEV
mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/AndroidBrowserRepositorySession.java
--- a/mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/AndroidBrowserRepositorySession.java
+++ b/mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/AndroidBrowserRepositorySession.java
@@ -463,20 +463,16 @@ public abstract class AndroidBrowserRepo
             trace("Both local and remote records have been modified.");
             if (record.lastModified > existingRecord.lastModified) {
               trace("Remote is newer, and deleted. Deleting local.");
               storeRecordDeletion(record, existingRecord);
               return;
             }
 
             trace("Remote is older, local is not deleted. Ignoring.");
-            if (!locallyModified) {
-              Logger.warn(LOG_TAG, "Inconsistency: old remote record is deleted, but local record not modified!");
-              // Ensure that this is tracked for upload.
-            }
             return;
           }
           // End deletion logic.
 
           // Now we're processing a non-deleted incoming record.
           // Apply any changes we need in order to correctly find existing records.
           fixupRecord(record);