Merge change 23698 into eclair (14de0880) · Commits · e / os / android_frameworks_base

core/java/android/content/SyncManager.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -177,6 +177,7 @@ class SyncManager implements OnAccountsUpdatedListener {
		private BroadcastReceiver mBootCompletedReceiver = new BroadcastReceiver() {
		public void onReceive(Context context, Intent intent) {
		if (!mFactoryTest) {
		mBootCompleted = true;
		AccountManager.get(mContext).addOnAccountsUpdatedListener(SyncManager.this,
		mSyncHandler, true /* updateImmediately */);
		}
		@@ -283,6 +284,8 @@ class SyncManager implements OnAccountsUpdatedListener {

		private final boolean mFactoryTest;

		private volatile boolean mBootCompleted = false;

		private ConnectivityManager getConnectivityManager() {
		synchronized (this) {
		if (mConnManagerDoNotUseDirectly == null) {
		@@ -541,6 +544,13 @@ class SyncManager implements OnAccountsUpdatedListener {
		Bundle extras, long delay, boolean onlyThoseWithUnkownSyncableState) {
		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 (isLoggable) {
		Log.v(TAG, "not syncing because sync is disabled");