Merge "Properly clamp the window size." into jb-ub-mail-ur10
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4282fcc..b49150f 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="500054" >
+ android:versionCode="500055" >
<uses-permission
android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
diff --git a/src/com/android/exchange/service/EmailSyncAdapterService.java b/src/com/android/exchange/service/EmailSyncAdapterService.java
index d76a6d6..ba5633a 100644
--- a/src/com/android/exchange/service/EmailSyncAdapterService.java
+++ b/src/com/android/exchange/service/EmailSyncAdapterService.java
@@ -83,6 +83,9 @@
private static final long KICK_SYNC_INTERVAL =
DateUtils.HOUR_IN_MILLIS / DateUtils.SECOND_IN_MILLIS;
+ /** Controls whether we do a periodic "kick" to restart the ping. */
+ private static final boolean SCHEDULE_KICK = false;
+
/**
* If sync extras do not include a mailbox id, then we want to perform a full sync.
*/
@@ -257,15 +260,17 @@
// Whenever we have a running ping, make sure this service stays running.
service.startService(new Intent(service, EmailSyncAdapterService.class));
}
- // Schedule a ping kicker for this account.
- ContentResolver.addPeriodicSync(amAccount, EmailContent.AUTHORITY, extras,
- KICK_SYNC_INTERVAL);
+ if (SCHEDULE_KICK) {
+ ContentResolver.addPeriodicSync(amAccount, EmailContent.AUTHORITY, extras,
+ KICK_SYNC_INTERVAL);
+ }
} else {
if (pingSyncHandler != null) {
pingSyncHandler.stop();
}
- // Stop the ping kicker for this account.
- ContentResolver.removePeriodicSync(amAccount, EmailContent.AUTHORITY, extras);
+ if (SCHEDULE_KICK) {
+ ContentResolver.removePeriodicSync(amAccount, EmailContent.AUTHORITY, extras);
+ }
}
}
