Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a666d74d authored by Simranjit Singh Kohli's avatar Simranjit Singh Kohli
Browse files

[Fix extra data in cache] 

It seems that some account authenticators call getData before account
is added, which initializes the cache for that account.
1. We now don't initialize the cache if the account is not on the device.
2. We now use locking.

Bug: 23018710
Bug: 20071745
Change-Id: Ie59ca6b4e575f524a9d3bf286c3bd95abce4a596
parent f0c5b7af

services/core/java/com/android/server/accounts/AccountManagerService.java

+54 −36
Original line number Diff line number Diff line
@@ -660,7 +660,12 @@ public class AccountManagerService 
        long identityToken = clearCallingIdentity();

        try {

            UserAccounts accounts = getUserAccounts(userId);

            return readUserDataInternal(accounts, account, key);

            synchronized (accounts.cacheLock) {

                if (!accountExistsCacheLocked(accounts, account)) {

                    return null;

                }

                return readUserDataInternalLocked(accounts, account, key);

            }

        } finally {

            restoreCallingIdentity(identityToken);

        }
@@ -1716,18 +1721,33 @@ public class AccountManagerService 
        long identityToken = clearCallingIdentity();

        try {

            UserAccounts accounts = getUserAccounts(userId);

            setUserdataInternal(accounts, account, key, value);

            synchronized (accounts.cacheLock) {

                if (!accountExistsCacheLocked(accounts, account)) {

                    return;

                }

                setUserdataInternalLocked(accounts, account, key, value);

            }

        } finally {

            restoreCallingIdentity(identityToken);

        }

    }



    private void setUserdataInternal(UserAccounts accounts, Account account, String key,

    private boolean accountExistsCacheLocked(UserAccounts accounts, Account account) {

        if (accounts.accountCache.containsKey(account.type)) {

            for (Account acc : getUserAccountsForCaller().accountCache.get(account.type)) {

                if (acc.name.equals(account.name)) {

                    return true;

                }

            }

        }

        return false;

    }



    private void setUserdataInternalLocked(UserAccounts accounts, Account account, String key,

            String value) {

        if (account == null || key == null) {

            return;

        }

        synchronized (accounts.cacheLock) {

        final SQLiteDatabase db = accounts.openHelper.getWritableDatabase();

        db.beginTransaction();

        try {
@@ -1755,7 +1775,6 @@ public class AccountManagerService 
            db.endTransaction();

        }

    }

    }



    private void onResult(IAccountManagerResponse response, Bundle result) {

        if (result == null) {
@@ -4788,8 +4807,8 @@ public class AccountManagerService 
        }

    }



    protected String readUserDataInternal(UserAccounts accounts, Account account, String key) {

        synchronized (accounts.cacheLock) {

    protected String readUserDataInternalLocked(

            UserAccounts accounts, Account account, String key) {

        HashMap<String, String> userDataForAccount = accounts.userDataCache.get(account);

        if (userDataForAccount == null) {

            // need to populate the cache for this account
@@ -4799,7 +4818,6 @@ public class AccountManagerService 
        }

        return userDataForAccount.get(key);

    }

    }



    protected HashMap<String, String> readUserDataForAccountFromDatabaseLocked(

            final SQLiteDatabase db, Account account) {