diff options
| author | Fred Quintana <fredq@google.com> | 2011-03-01 12:30:06 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-01 12:30:06 -0800 |
| commit | dfa28c3449a3fb9bf5c1875f1532e73e73e74440 (patch) | |
| tree | 09574c547fa6620e950ccca015b3ae2f9711cf5e /core/tests | |
| parent | 2380aa08c2571b4e2577a14f02a93a8047236460 (diff) | |
| parent | f9f240e3ad5ff5eeaa32fbb2dd65ef7f3b06af32 (diff) | |
| download | frameworks_base-dfa28c3449a3fb9bf5c1875f1532e73e73e74440.zip frameworks_base-dfa28c3449a3fb9bf5c1875f1532e73e73e74440.tar.gz frameworks_base-dfa28c3449a3fb9bf5c1875f1532e73e73e74440.tar.bz2 | |
Merge "Fix a deadlock in AccountManagerService cause by different paths of code getting the mCacheLock and DB locks in different orders."
Diffstat (limited to 'core/tests')
| -rw-r--r-- | core/tests/coretests/src/android/accounts/AccountManagerServiceTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/tests/coretests/src/android/accounts/AccountManagerServiceTest.java b/core/tests/coretests/src/android/accounts/AccountManagerServiceTest.java index 887b032..6efc61a 100644 --- a/core/tests/coretests/src/android/accounts/AccountManagerServiceTest.java +++ b/core/tests/coretests/src/android/accounts/AccountManagerServiceTest.java @@ -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()); |