From 751fdc09bb7ab0ce6feac7b7a823e38ed858feb0 Mon Sep 17 00:00:00 2001
From: Fred Quintana <fredq@google.com>
Date: Tue, 9 Feb 2010 14:13:18 -0800
Subject: [PATCH] only make AccountManager throw an exception on blocking calls
 in the UI thread if the application's SDK is froyo or later

---
 core/java/android/accounts/AccountManager.java        | 5 ++++-
 core/java/android/accounts/AccountManagerService.java | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java
index 652f405af4b85..be15ac9968346 100644
--- a/core/java/android/accounts/AccountManager.java
+++ b/core/java/android/accounts/AccountManager.java
@@ -27,6 +27,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.RemoteException;
 import android.os.Parcelable;
+import android.os.Build;
 import android.util.Log;
 
 import java.io.IOException;
@@ -841,7 +842,9 @@ public class AccountManager {
                     "calling this from your main thread can lead to deadlock");
             Log.e(TAG, "calling this from your main thread can lead to deadlock and/or ANRs",
                     exception);
-            throw exception;
+            if (mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.FROYO) {
+                throw exception;
+            }
         }
     }
 
diff --git a/core/java/android/accounts/AccountManagerService.java b/core/java/android/accounts/AccountManagerService.java
index e3ccd000f153e..785012418c267 100644
--- a/core/java/android/accounts/AccountManagerService.java
+++ b/core/java/android/accounts/AccountManagerService.java
@@ -1788,7 +1788,7 @@ public class AccountManagerService
         if (!permissionGranted && isDebuggableMonkeyBuild) {
             // TODO: Skip this check when running automated tests. Replace this
             // with a more general solution.
-            Log.w(TAG, "no credentials permission for usage of " + account + ", "
+            Log.d(TAG, "no credentials permission for usage of " + account + ", "
                     + authTokenType + " by uid " + Binder.getCallingUid()
                     + " but ignoring since this is a monkey build");
             return true;