Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c6684f9e: Fix previous quick fix, LoginOptions is final.

Browse Source 
* commit 'c6684f9e9790e92960504e9b32f20f27003d9f37':
  Fix previous quick fix, LoginOptions is final.
This commit is contained in:
Costin Manolache
2011-01-14 11:29:59 -08:00
committed by Android Git Automerger
parent 527d6c03ab c6684f9e97
commit 660f72a016
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -861,7 +861,7 @@ public class AccountManagerService
public void getAuthToken(IAccountManagerResponse response, final Account account,
final String authTokenType, final boolean notifyOnAuthFailure,
final boolean expectActivityLaunch, final Bundle loginOptions) {
final boolean expectActivityLaunch, Bundle loginOptionsIn) {
if (Log.isLoggable(TAG, Log.VERBOSE)) {
Log.v(TAG, "getAuthToken: " + account
+ ", response " + response
@@ -888,9 +888,8 @@ public class AccountManagerService
final boolean permissionGranted = customTokens ||
permissionIsGranted(account, authTokenType, callerUid);
if (loginOptions == null) {
loginOptions = new Bundle();
}
final Bundle loginOptions = (loginOptionsIn == null) ? new Bundle() :
loginOptionsIn;
if (customTokens) {
// let authenticator know the identity of the caller
loginOptions.putInt(AccountManager.KEY_CALLER_UID, callerUid);