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

Commit 9fba722a authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by Android (Google) Code Review
Browse files

Merge "Introduced AccountDb API replacing helpers"

parents 06a1def8 00de49e2

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

+2 −3
Original line number Diff line number Diff line
@@ -142,9 +142,8 @@ public final class AccountManagerBackupHelper { 
        final AccountManagerService.UserAccounts accounts = mAccountManagerService

                .getUserAccounts(userId);

        synchronized (accounts.cacheLock) {

            SQLiteDatabase db = accounts.openHelper.getReadableDatabase();

            List<Pair<String, Integer>> allAccountGrants = DeDatabaseHelper.findAllAccountGrants(

                    db);

            List<Pair<String, Integer>> allAccountGrants = accounts.accountsDb

                    .findAllAccountGrants();

            if (allAccountGrants.isEmpty()) {

                return null;

            }

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

+105 −150

File changed.

Preview size limit exceeded, changes collapsed.

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

+550 −525

File changed.

Preview size limit exceeded, changes collapsed.