commit 4547f53cedb8973711e0c4c6e54ec2e8c99f34eb
author Marc Blank <mblank@google.com> Tue Aug 30 10:28:39 2011 -0700
committer Marc Blank <mblank@google.com> Wed Aug 31 13:10:57 2011 -0700
tree 4dee084e6067d51be86ee788ba798db6dbd76471
parent faba0e7415731b9a7321eeb019fbe2f2e33e17b6

Add logging for roaming tests (with STOPSHIP)

Bug: 5215657

Change-Id: Ib3999c31f4d8f304bd4526aabf94fdf6ea01bf06

src/com/android/exchange/ExchangeService.java

diff --git a/src/com/android/exchange/ExchangeService.java b/src/com/android/exchange/ExchangeService.java
index 4ce1b2f..153b7ed 100644
--- a/src/com/android/exchange/ExchangeService.java
+++ b/src/com/android/exchange/ExchangeService.java
@@ -2111,21 +2111,34 @@
      * @return whether or not the account can sync automatically
      */
     /*package*/ static boolean canAutoSync(Account account) {
+        // STOPSHIP Remove logging!!
         ExchangeService exchangeService = INSTANCE;
-        if (exchangeService == null) return false;
+        if (exchangeService == null) {
+            log("***** canAutoSync " + account.mDisplayName + ", no exchangeservice!");
+            return false;
+        }
         NetworkInfo networkInfo = exchangeService.mNetworkInfo;
 
         // Enforce manual sync only while roaming here
         long policyKey = account.mPolicyKey;
+        log("***** canAutoSync " + account.mDisplayName + ", policyKey = " + policyKey + " " +
+                ((networkInfo == null) ? "?no network info?" : networkInfo.getType()));
         // Quick exit from this check
         if ((policyKey != 0) && (networkInfo != null) &&
-                (networkInfo.getType() == ConnectivityManager.TYPE_MOBILE)) {
+                (ConnectivityManager.isNetworkTypeMobile(networkInfo.getType()))) {
             // We'll cache the Policy data here
             Policy policy = account.mPolicy;
             if (policy == null) {
                 policy = Policy.restorePolicyWithId(INSTANCE, policyKey);
                 account.mPolicy = policy;
             }
+            if (policy == null) {
+                log("***** canAuthSync policy is null");
+            } else {
+                log("***** canAutoSync " +
+                        (networkInfo.isRoaming() ? "roaming" : "not roaming") + ", required: " +
+                        policy.mRequireManualSyncWhenRoaming);
+            }
             if (policy != null && policy.mRequireManualSyncWhenRoaming && networkInfo.isRoaming()) {
                 return false;
             }