Bug 1046709 - Post: remove dead code r=nalexander
authorGrigory Kruglov <gkruglov@mozilla.com>
Thu, 07 Apr 2016 19:08:42 -0400
changeset 331670 1daa36fd1395c78c182743f3fbcea8a515e727f1
parent 331669 4639a73a29d3bc5b145c98517bba9170b7cf7c49
child 331671 21a6c80e744da571849aa8f56d8da037ae18c1b4
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1046709
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1046709 - Post: remove dead code r=nalexander 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);