From 5c5f3a0dbcef00bc1a20f16f924bab85133e4407 Mon Sep 17 00:00:00 2001
From: Marc Blank <mblank@google.com>
Date: Tue, 5 Oct 2010 12:52:35 -0700
Subject: [PATCH] Fix issue w/ race condition leading to log spam

Bug: 3064901
Change-Id: I115fa6878ae9b4464b3f0b9cace1f200e2e5f47c
---
 src/com/android/exchange/SyncManager.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index 8d71c2b91..bf8b8b0ba 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -69,21 +69,21 @@ import android.database.ContentObserver;
 import android.database.Cursor;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.net.NetworkInfo.State;
 import android.net.Uri;
+import android.net.NetworkInfo.State;
 import android.os.Bundle;
 import android.os.Debug;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
 import android.os.Process;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
+import android.os.PowerManager.WakeLock;
 import android.provider.Calendar;
+import android.provider.ContactsContract;
 import android.provider.Calendar.Calendars;
 import android.provider.Calendar.Events;
-import android.provider.ContactsContract;
 import android.util.Log;
 
 import java.io.BufferedReader;
@@ -1792,8 +1792,8 @@ public class SyncManager extends Service implements Runnable {
             alwaysLog("!!! EAS SyncManager, onDestroy");
             // Stop the sync manager thread and return
             synchronized (sSyncLock) {
-                sStop = true;
                 if (sServiceThread != null) {
+                    sStop = true;
                     sServiceThread.interrupt();
                 }
             }