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

Commit dfa28c34 authored by Fred Quintana's avatar Fred Quintana Committed by Android (Google) Code Review
Browse files

Merge "Fix a deadlock in AccountManagerService cause by different paths of... 

Merge "Fix a deadlock in AccountManagerService cause by different paths of code getting the mCacheLock and DB locks in different orders."
parents 2380aa08 f9f240e3

core/java/android/accounts/AccountManagerService.java

+350 −318

File changed.

Preview size limit exceeded, changes collapsed.

core/tests/coretests/src/android/accounts/AccountManagerServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public class AccountManagerServiceTest extends AndroidTestCase { 
        assertEquals(a21, accounts[1]);

        assertEquals(a31, accounts[2]);



        mAms.removeAccount(a21);

        mAms.removeAccountInternal(a21);



        accounts = mAms.getAccounts("type1" );

        Arrays.sort(accounts, new AccountSorter());