Merge "Do not allow 0 or smaller periodicity for syncs. b/9295383" into jb-mr2-dev

2013-06-10 20:15:59 +00:00
parent a9221987c0 59dc7a8e75
commit 58100fb813
1 changed files with 4 additions and 0 deletions
--- a/services/java/com/android/server/content/SyncManager.java
+++ b/services/java/com/android/server/content/SyncManager.java
@@ -1971,6 +1971,10 @@ public class SyncManager {
                for (int i = 0, N = info.periodicSyncs.size(); i < N; i++) {
                    final Bundle extras = info.periodicSyncs.get(i).first;
                    final Long periodInMillis = info.periodicSyncs.get(i).second * 1000;
+                    // Skip if the period is invalid
+                    if (periodInMillis <= 0) {
+                        continue;
+                    }
                    // find when this periodic sync was last scheduled to run
                    final long lastPollTimeAbsolute = status.getPeriodicSyncTime(i);