commit 91e5c5bfa6a12679c7611160ad848d4fa2fc73ad
author Marc Blank <mblank@google.com> Mon Dec 05 17:26:20 2011 -0800
committer Marc Blank <mblank@google.com> Mon Dec 05 17:28:58 2011 -0800
tree 7c967280264c737deb5305605a01b574fd59b16e
parent 1d4f429f583dd6ba18d0894b2b1d02afb968c96f

Have EasSyncService use same connectivity test as ExchangeService

* This will prevent looping behavior due to any inconsistency in
  result of the test.

Bug: 5707530

Change-Id: I0d3cd6888b370a6f8a2d044192a909c830e6cada

src/com/android/exchange/AbstractSyncService.java

diff --git a/src/com/android/exchange/AbstractSyncService.java b/src/com/android/exchange/AbstractSyncService.java
index 9f7f7fc..6ccc7c3 100644
--- a/src/com/android/exchange/AbstractSyncService.java
+++ b/src/com/android/exchange/AbstractSyncService.java
@@ -256,15 +256,14 @@
      */
     public boolean hasConnectivity() {
         ConnectivityManager cm =
-            (ConnectivityManager)mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
+                (ConnectivityManager)mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
         int tries = 0;
         while (tries++ < 1) {
+            // Use the same test as in ExchangeService#waitForConnectivity
+            // TODO: Create common code for this test in emailcommon
             NetworkInfo info = cm.getActiveNetworkInfo();
-            if (info != null && info.isConnected()) {
-                DetailedState state = info.getDetailedState();
-                if (state == DetailedState.CONNECTED) {
-                    return true;
-                }
+            if (info != null) {
+                return true;
             }
             try {
                 Thread.sleep(10*SECONDS);