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

Merge "Add access tracker to renamed accounts" into nyc-mr1-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2016-09-19 22:15:13 +00:00
committed by Android (Google) Code Review
parent 944dc5a40e b9f84fb6f4
commit 85a93a0cc9
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/accounts/AccountManagerService.java
View File

@@ -1562,8 +1562,10 @@ public class AccountManagerService
/* /*
* Database transaction was successful. Clean up cached * Database transaction was successful. Clean up cached
* data associated with the account in the user profile. * data associated with the account in the user profile.
* The account is now being tracked for remote access.
*/ */
insertAccountIntoCacheLocked(accounts, renamedAccount); renamedAccount = insertAccountIntoCacheLocked(accounts, renamedAccount);
/* /*
* Extract the data and token caches before removing the * Extract the data and token caches before removing the
* old account to preserve the user data associated with * old account to preserve the user data associated with
@@ -5701,16 +5703,22 @@ public class AccountManagerService
/** /**
* This assumes that the caller has already checked that the account is not already present. * This assumes that the caller has already checked that the account is not already present.
* IMPORTANT: The account being inserted will begin to be tracked for access in remote
* processes and if you will return this account to apps you should return the result.
* @return The inserted account which is a new instance that is being tracked.
*/ */
private void insertAccountIntoCacheLocked(UserAccounts accounts, Account account) { private Account insertAccountIntoCacheLocked(UserAccounts accounts, Account account) {
Account[] accountsForType = accounts.accountCache.get(account.type); Account[] accountsForType = accounts.accountCache.get(account.type);
int oldLength = (accountsForType != null) ? accountsForType.length : 0; int oldLength = (accountsForType != null) ? accountsForType.length : 0;
Account[] newAccountsForType = new Account[oldLength + 1]; Account[] newAccountsForType = new Account[oldLength + 1];
if (accountsForType != null) { if (accountsForType != null) {
System.arraycopy(accountsForType, 0, newAccountsForType, 0, oldLength); System.arraycopy(accountsForType, 0, newAccountsForType, 0, oldLength);
} }
newAccountsForType[oldLength] = new Account(account, new AccountAccessTracker()); IAccountAccessTracker accessTracker = account.getAccessTracker() != null
? account.getAccessTracker() : new AccountAccessTracker();
newAccountsForType[oldLength] = new Account(account, accessTracker);
accounts.accountCache.put(account.type, newAccountsForType); accounts.accountCache.put(account.type, newAccountsForType);
return newAccountsForType[oldLength];
} }
private Account[] filterSharedAccounts(UserAccounts userAccounts, Account[] unfiltered, private Account[] filterSharedAccounts(UserAccounts userAccounts, Account[] unfiltered,