Merge "Defend against an unexpected null bundle that causes... (bcfcafe1) · Commits · e / os / android_frameworks_base

core/java/android/accounts/AccountManager.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -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)