summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Natalie Masse <nmasse@google.com> 2014-11-25 18:51:24 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-11-25 18:51:24 +0000
commit82f5fde34c8a98ace75fbc0dab8ffb97485808e9 (patch)
tree416b911369f212ea9c7829505b5585102675ba89
parent657fcb172e76772198505e4acfd8b67b74bc3c30 (diff)
parent18c295bf8b258e94050b2e2fb741cb597011159b (diff)
am 18c295bf: am a05d4a4b: am 8d9e6434: am 65e51fcd: am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs
* commit '18c295bf8b258e94050b2e2fb741cb597011159b': Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
-rw-r--r--docs/html/training/sync-adapters/running-sync-adapter.jd6
1 files changed, 2 insertions, 4 deletions
diff --git a/docs/html/training/sync-adapters/running-sync-adapter.jd b/docs/html/training/sync-adapters/running-sync-adapter.jd
index 8fb7e80ce5bd..194e94b40304 100644
--- a/docs/html/training/sync-adapters/running-sync-adapter.jd
+++ b/docs/html/training/sync-adapters/running-sync-adapter.jd
@@ -396,13 +396,11 @@ public class MainActivity extends FragmentActivity {
// Account
public static final String ACCOUNT = "default_account";
// Sync interval constants
- public static final long MILLISECONDS_PER_SECOND = 1000L;
public static final long SECONDS_PER_MINUTE = 60L;
public static final long SYNC_INTERVAL_IN_MINUTES = 60L;
public static final long SYNC_INTERVAL =
SYNC_INTERVAL_IN_MINUTES *
- SECONDS_PER_MINUTE *
- MILLISECONDS_PER_SECOND;
+ SECONDS_PER_MINUTE;
// Global variables
// A content resolver for accessing the provider
ContentResolver mResolver;
@@ -419,7 +417,7 @@ public class MainActivity extends FragmentActivity {
ContentResolver.addPeriodicSync(
ACCOUNT,
AUTHORITY,
- null,
+ Bundle.EMPTY,
SYNC_INTERVAL);
...
}