diff options
| author | Costin Manolache <costin@google.com> | 2011-01-14 10:52:11 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-14 10:52:11 -0800 |
| commit | 05db1af9bb42b4b2e668aba2dfcd61878a235764 (patch) | |
| tree | 76abd53fc07801e459a4f5086fdf31b8b0e9ee34 /core/java | |
| parent | 679cd50aab27235341f1e869af0216366147d6e1 (diff) | |
| parent | 75b8fc7e0ce451eaa50d31e3dd7d60d466186c28 (diff) | |
Merge "Fix NPE, caller may not pass loginOptions." into honeycomb
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 6e045877aa9d..d23aceb62c91 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); |