diff options
| author | Costin Manolache <costin@google.com> | 2011-01-14 10:50:38 -0800 |
|---|---|---|
| committer | Costin Manolache <costin@google.com> | 2011-01-14 10:50:38 -0800 |
| commit | 75b8fc7e0ce451eaa50d31e3dd7d60d466186c28 (patch) | |
| tree | 81fac474b96a62648f88bb84bee4c352ec19aa5f /core/java | |
| parent | 3045bbaf58574ad3168466b198b835b29d174c18 (diff) | |
| download | frameworks_base-75b8fc7e0ce451eaa50d31e3dd7d60d466186c28.zip frameworks_base-75b8fc7e0ce451eaa50d31e3dd7d60d466186c28.tar.gz frameworks_base-75b8fc7e0ce451eaa50d31e3dd7d60d466186c28.tar.bz2 | |
Fix NPE, caller may not pass loginOptions.
Change-Id: Ifb6a8bf876d30a9726f535a90ba8c0719a9a04aa
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/accounts/AccountManagerService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/accounts/AccountManagerService.java b/core/java/android/accounts/AccountManagerService.java index 6e04587..d23aceb 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); |