diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-09-26 22:03:49 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2012-09-27 16:22:53 -0700 |
| commit | 625239a05401bbf18b04d9874cea3f82da7c29a1 (patch) | |
| tree | b7d6cdc6c51342262763ad251870350759800ed3 /core/java/android/content/SyncManager.java | |
| parent | e00d33cf05a111c9be605d3d59db911cd983fcb9 (diff) | |
| download | frameworks_base-625239a05401bbf18b04d9874cea3f82da7c29a1.zip frameworks_base-625239a05401bbf18b04d9874cea3f82da7c29a1.tar.gz frameworks_base-625239a05401bbf18b04d9874cea3f82da7c29a1.tar.bz2 | |
Migrate more Secure settings to Global.
Migrate networking, storage, battery, DropBox, and PackageManager
related Secure settings to Global table.
Bug: 7232014, 7231331, 7231198
Change-Id: I772c2a9586a2f708c9db95622477f235064b8f4d
Diffstat (limited to 'core/java/android/content/SyncManager.java')
| -rw-r--r-- | core/java/android/content/SyncManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/content/SyncManager.java b/core/java/android/content/SyncManager.java index 4999a2d..564a804 100644 --- a/core/java/android/content/SyncManager.java +++ b/core/java/android/content/SyncManager.java @@ -777,8 +777,8 @@ public class SyncManager implements OnAccountsUpdateListener { } // Cap the delay - long maxSyncRetryTimeInSeconds = Settings.Secure.getLong(mContext.getContentResolver(), - Settings.Secure.SYNC_MAX_RETRY_DELAY_IN_SECONDS, + long maxSyncRetryTimeInSeconds = Settings.Global.getLong(mContext.getContentResolver(), + Settings.Global.SYNC_MAX_RETRY_DELAY_IN_SECONDS, DEFAULT_MAX_SYNC_RETRY_TIME_IN_SECONDS); if (newDelayInMs > maxSyncRetryTimeInSeconds * 1000) { newDelayInMs = maxSyncRetryTimeInSeconds * 1000; |