summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatalie Masse <nmasse@google.com>2014-11-25 11:22:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-25 11:22:05 +0000
commit8d9e64343decaaf56a7d1fae5ed14ed172e9d7dd (patch)
treea3229d904e9851b4bb95441d4ede5c249311e83e
parentf51d7015df585b61d6a4f72f2327df7dcdec8899 (diff)
parent65e51fcda25c33cdfa73e8ca3a4f71cf987bd0d2 (diff)
downloadframeworks_base-8d9e64343decaaf56a7d1fae5ed14ed172e9d7dd.zip
frameworks_base-8d9e64343decaaf56a7d1fae5ed14ed172e9d7dd.tar.gz
frameworks_base-8d9e64343decaaf56a7d1fae5ed14ed172e9d7dd.tar.bz2
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 '65e51fcda25c33cdfa73e8ca3a4f71cf987bd0d2': 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 8fb7e80..194e94b 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);
...
}