commit b19ad6fd50e048feca04db60e0da174c9eac430b
author Marc Blank <mblank@google.com> Fri Feb 19 16:59:11 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 19 16:59:11 2010 -0800
tree 25ae5823c55fcd43ba3f92961eaf34c018d807d1
parent a9963a01a5c5d592127c86bf6edd1ecf483f19bc
parent 68f790bbbd80daf6221d356727ba8ec41aea22aa

Merge "Fix #2457665 (Guests don't appear in Exchange events)"

src/com/android/exchange/SyncManager.java

diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index 8ecbb67..f60bc39 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -881,7 +881,7 @@
         }
     }
 
-    protected void log(String str) {
+    protected static void log(String str) {
         if (Eas.USER_LOG) {
             Log.d(TAG, str);
             if (Eas.FILE_LOG) {
@@ -890,7 +890,7 @@
         }
     }
 
-    protected void alwaysLog(String str) {
+    protected static void alwaysLog(String str) {
         if (!Eas.USER_LOG) {
             Log.d(TAG, str);
         } else {
@@ -1384,7 +1384,7 @@
      * @param blockExternalChanges FOR TESTING ONLY - block backups, security changes, etc.
      * @param resolver the content resolver for making provider updates (injected for testability)
      */
-    void reconcileAccountsWithAccountManager(Context context,
+    /* package */ static void reconcileAccountsWithAccountManager(Context context,
             List<Account> cachedEasAccounts, android.accounts.Account[] accountManagerAccounts,
             boolean blockExternalChanges, ContentResolver resolver) {
         // First, look through our cached EAS Accounts (from EmailProvider) to make sure there's a
@@ -1428,19 +1428,18 @@
                 alwaysLog("Account deleted from provider; deleting from AccountManager: " +
                         accountManagerAccountName);
                 // Delete the account
-                AccountManagerFuture<Boolean> blockingResult;
-                blockingResult = AccountManager.get(context)
+                AccountManagerFuture<Boolean> blockingResult = AccountManager.get(context)
                         .removeAccount(accountManagerAccount, null, null);
                 try {
                     // Note: All of the potential errors from removeAccount() are simply logged
                     // here, as there is nothing to actually do about them.
                     blockingResult.getResult();
                 } catch (OperationCanceledException e) {
-                    Log.d(Email.LOG_TAG, e.toString());
+                    Log.w(Email.LOG_TAG, e.toString());
                 } catch (AuthenticatorException e) {
-                    Log.d(Email.LOG_TAG, e.toString());
+                    Log.w(Email.LOG_TAG, e.toString());
                 } catch (IOException e) {
-                    Log.d(Email.LOG_TAG, e.toString());
+                    Log.w(Email.LOG_TAG, e.toString());
                 }
                 accountsDeleted = true;
             }