drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE, caller may not pass loginOptions." into honeycomb

Browse Source
This commit is contained in:
Costin Manolache
2011-01-14 10:52:11 -08:00
committed by Android (Google) Code Review
parent 679cd50aab 75b8fc7e0c
commit 05db1af9bb
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/accounts/AccountManagerService.java
View File

@ -888,6 +888,9 @@ public class AccountManagerService
final boolean permissionGranted = customTokens || final boolean permissionGranted = customTokens ||
permissionIsGranted(account, authTokenType, callerUid); permissionIsGranted(account, authTokenType, callerUid);
if (loginOptions == null) {
loginOptions = new Bundle();
}
if (customTokens) { if (customTokens) {
// let authenticator know the identity of the caller // let authenticator know the identity of the caller
loginOptions.putInt(AccountManager.KEY_CALLER_UID, callerUid); loginOptions.putInt(AccountManager.KEY_CALLER_UID, callerUid);