commit 9e754f56ec56d13ef8486f7dcd5a9d6e0ee49671
author Alon Albert <aalbert@google.com> Fri Sep 27 15:12:08 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 27 15:12:09 2013 +0000
tree e60fbb3a4a3bf77d93146af59bebf3c7d9338753
parent 59aab722c5a3c6bf29de2f451e5a111bc81e48c8
parent add575db94f86397c9246d89ed85d29968b5aeaa

Merge "Increase Sync Windows" into jb-ub-mail-ur10

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bccd96b..438aff6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.exchange"
-    android:versionCode="500051" >
+    android:versionCode="500052" >
 
     <uses-permission
         android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

src/com/android/exchange/service/EasMailboxSyncHandler.java

diff --git a/src/com/android/exchange/service/EasMailboxSyncHandler.java b/src/com/android/exchange/service/EasMailboxSyncHandler.java
index c69a83e..de385a8 100644
--- a/src/com/android/exchange/service/EasMailboxSyncHandler.java
+++ b/src/com/android/exchange/service/EasMailboxSyncHandler.java
@@ -47,11 +47,8 @@
     }
 
     private String getEmailFilter() {
-        int syncLookback = mMailbox.mSyncLookback;
-        if (syncLookback == SyncWindow.SYNC_WINDOW_ACCOUNT
-                || mMailbox.mType == Mailbox.TYPE_INBOX) {
-            syncLookback = mAccount.mSyncLookback;
-        }
+        final int syncLookback = mMailbox.mSyncLookback == SyncWindow.SYNC_WINDOW_ACCOUNT
+                ? mAccount.mSyncLookback : mMailbox.mSyncLookback;
         switch (syncLookback) {
             case SyncWindow.SYNC_WINDOW_1_DAY:
                 return Eas.FILTER_1_DAY;