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

Commit 627fc202 authored by Fyodor Kupolov's avatar Fyodor Kupolov
Browse files

Delete account from DE and CE databases 

When authenticator no longer exists and the user is unlocked, we should
remove accounts from both tables in a single transaction.

Bug: 28910995
Change-Id: Ibabf5d3e5ba561ffb3dda03aef99e358e2f71c58
parent ce289e93

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

+13 −1
Original line number Diff line number Diff line
@@ -432,6 +432,7 @@ public class AccountManagerService 


        final HashMap<String, Integer> knownAuth = getAuthenticatorTypeAndUIDForUser(

                mAuthenticatorCache, accounts.userId);

        boolean userUnlocked = isLocalUnlockedUser(accounts.userId);



        synchronized (accounts.cacheLock) {

            final SQLiteDatabase db = accounts.openHelper.getWritableDatabase();
@@ -530,7 +531,18 @@ public class AccountManagerService 
                    if (obsoleteAuthType.contains(accountType)) {

                        Slog.w(TAG, "deleting account " + accountName + " because type "

                                + accountType + "'s registered authenticator no longer exist.");

                        db.beginTransaction();

                        try {

                            db.delete(TABLE_ACCOUNTS, ACCOUNTS_ID + "=" + accountId, null);

                            // Also delete from CE table if user is unlocked; if user is currently

                            // locked the account will be removed later by syncDeCeAccountsLocked

                            if (userUnlocked) {

                                db.delete(CE_TABLE_ACCOUNTS, ACCOUNTS_ID + "=" + accountId, null);

                            }

                            db.setTransactionSuccessful();

                        } finally {

                            db.endTransaction();

                        }

                        accountDeleted = true;



                        logRecord(db, DebugDbHelper.ACTION_AUTHENTICATOR_REMOVE, TABLE_ACCOUNTS,