Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 23698 into eclair

Browse Source 
* changes:
  suppress syncs until boot is complete
This commit is contained in:
Android (Google) Code Review
2009-09-02 16:50:13 -07:00
parent f6ca7fab50 4f9cfc5c52
commit 14de0880dd
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/content/SyncManager.java
View File

@@ -177,6 +177,7 @@ class SyncManager implements OnAccountsUpdatedListener {
private BroadcastReceiver mBootCompletedReceiver = new BroadcastReceiver() { private BroadcastReceiver mBootCompletedReceiver = new BroadcastReceiver() {
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (!mFactoryTest) { if (!mFactoryTest) {
mBootCompleted = true;
AccountManager.get(mContext).addOnAccountsUpdatedListener(SyncManager.this, AccountManager.get(mContext).addOnAccountsUpdatedListener(SyncManager.this,
mSyncHandler, true /* updateImmediately */); mSyncHandler, true /* updateImmediately */);
} }
@@ -283,6 +284,8 @@ class SyncManager implements OnAccountsUpdatedListener {
private final boolean mFactoryTest; private final boolean mFactoryTest;
private volatile boolean mBootCompleted = false;
private ConnectivityManager getConnectivityManager() { private ConnectivityManager getConnectivityManager() {
synchronized (this) { synchronized (this) {
if (mConnManagerDoNotUseDirectly == null) { if (mConnManagerDoNotUseDirectly == null) {
@@ -541,6 +544,13 @@ class SyncManager implements OnAccountsUpdatedListener {
Bundle extras, long delay, boolean onlyThoseWithUnkownSyncableState) { Bundle extras, long delay, boolean onlyThoseWithUnkownSyncableState) {
boolean isLoggable = Log.isLoggable(TAG, Log.VERBOSE); boolean isLoggable = Log.isLoggable(TAG, Log.VERBOSE);
if (!mBootCompleted) {
if (isLoggable) {
Log.v(TAG, "suppressing scheduleSync() since boot hasn't completed");
}
return;
}
if (!isSyncEnabled()) { if (!isSyncEnabled()) {
if (isLoggable) { if (isLoggable) {
Log.v(TAG, "not syncing because sync is disabled"); Log.v(TAG, "not syncing because sync is disabled");