From b763ab265130b5aa59e4de561ba3836ac294fe62 Mon Sep 17 00:00:00 2001
From: Fred Quintana <fredq@google.com>
Date: Tue, 18 Aug 2009 18:07:30 -0700
Subject: [PATCH] clean up some logs and clamp the syncable value

---
 core/java/android/content/SyncStorageEngine.java | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/core/java/android/content/SyncStorageEngine.java b/core/java/android/content/SyncStorageEngine.java
index 7f78e75b56999..3ff13ae97387d 100644
--- a/core/java/android/content/SyncStorageEngine.java
+++ b/core/java/android/content/SyncStorageEngine.java
@@ -419,6 +419,12 @@ public class SyncStorageEngine extends Handler {
 
     public void setIsSyncable(Account account, String providerName, int syncable) {
         int oldState;
+        if (syncable > 1) {
+            syncable = 1;
+        } else if (syncable < -1) {
+            syncable = -1;
+        }
+        Log.d(TAG, "setIsSyncable: " + account + ", provider " + providerName + " -> " + syncable);
         synchronized (mAuthorities) {
             AuthorityInfo authority = getOrCreateAuthorityLocked(account, providerName, -1, false);
             oldState = authority.syncable;
@@ -989,14 +995,18 @@ public class SyncStorageEngine extends Handler {
         AccountInfo account = mAccounts.get(accountName);
         if (account == null) {
             if (tag != null) {
-                Log.w(TAG, tag + ": unknown account " + accountName);
+                if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                    Log.v(TAG, tag + ": unknown account " + accountName);
+                }
             }
             return null;
         }
         AuthorityInfo authority = account.authorities.get(authorityName);
         if (authority == null) {
             if (tag != null) {
-                Log.w(TAG, tag + ": unknown authority " + authorityName);
+                if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                    Log.v(TAG, tag + ": unknown authority " + authorityName);
+                }
             }
             return null;
         }
@@ -1024,6 +1034,8 @@ public class SyncStorageEngine extends Handler {
                     ident++;
                 }
             }
+            Log.d(TAG, "created a new AuthorityInfo for " + accountName
+                    + ", provider " + authorityName);
             authority = new AuthorityInfo(accountName, authorityName, ident);
             account.authorities.put(authorityName, authority);
             mAuthorities.put(ident, authority);