From 75b8fc7e0ce451eaa50d31e3dd7d60d466186c28 Mon Sep 17 00:00:00 2001
From: Costin Manolache <costin@google.com>
Date: Fri, 14 Jan 2011 10:50:38 -0800
Subject: [PATCH] Fix NPE, caller may not pass loginOptions.

Change-Id: Ifb6a8bf876d30a9726f535a90ba8c0719a9a04aa
---
 core/java/android/accounts/AccountManagerService.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/accounts/AccountManagerService.java b/core/java/android/accounts/AccountManagerService.java
index 6e045877aa9d3..d23aceb62c91c 100644
--- a/core/java/android/accounts/AccountManagerService.java
+++ b/core/java/android/accounts/AccountManagerService.java
@@ -888,6 +888,9 @@ public class AccountManagerService
         final boolean permissionGranted = customTokens ||
             permissionIsGranted(account, authTokenType, callerUid);
 
+        if (loginOptions == null) {
+            loginOptions = new Bundle();
+        }
         if (customTokens) {
             // let authenticator know the identity of the caller
             loginOptions.putInt(AccountManager.KEY_CALLER_UID, callerUid);