From 96580e00654a052a82120c374c6b5961ef349a92 Mon Sep 17 00:00:00 2001 From: Fred Quintana Date: Thu, 4 Mar 2010 13:42:42 -0800 Subject: [PATCH] Defend against an unexpected null bundle that causes blockingGetAuthToken() to throw an NPE. http://b/issue?id=2420608 --- .../java/android/accounts/AccountManager.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index e2263fcb27b52..1bb1d0f3054e9 100644 --- a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java @@ -704,6 +704,15 @@ public class AccountManager { throws OperationCanceledException, IOException, AuthenticatorException { Bundle bundle = getAuthToken(account, authTokenType, notifyAuthFailure, null /* callback */, null /* handler */).getResult(); + if (bundle == null) { + // This should never happen, but it does, occasionally. If it does return null to + // signify that we were not able to get the authtoken. + // TODO: remove this when the bug is found that sometimes causes a null bundle to be + // returned + Log.e(TAG, "blockingGetAuthToken: null was returned from getResult() for " + + account + ", authTokenType " + authTokenType); + return null; + } return bundle.getString(KEY_AUTHTOKEN); } @@ -1166,6 +1175,16 @@ public class AccountManager { return this; } + protected void set(Bundle bundle) { + // TODO: somehow a null is being set as the result of the Future. Log this + // case to help debug where this is occurring. When this bug is fixed this + // condition statement should be removed. + if (bundle == null) { + Log.e(TAG, "the bundle must not be null", new Exception()); + } + super.set(bundle); + } + public abstract void doWork() throws RemoteException; private Bundle internalGetResult(Long timeout, TimeUnit unit)