Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fail issue
After calling mAccountManager.addAccountExplicitly(ACCT_1, null, null),
if broadcast process of account manager delays some time, onaccountsupdate()
interface of ContactsProvider will delete contact data of account2 as
non-system account added by calling createAndAssertMergedContact(ACCT_1, ACCT_2), so the function createAndAssertMergedContact() will fail.
The fix suggestion is: call addAccountExplicity(ACCT_2,null,null) function to
add account2, so that "account2" will not be deleted in onaccountsupdate()
function as system account, although these broadcast delay. Also to remove
account2 by calling mAccountManager.removeAccount(ACCT_2, null, null) at the
end of the case.
Change-Id: I59e1a9a0e2c98b3f132c9265ade59981a3ebc9b0
(cherry picked from commit 35920d0f3ce0d147f3a8d0dc1f2518e1bf8a7631)
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsProvider2_AccountRemovalTest.java b/tests/tests/provider/src/android/provider/cts/ContactsProvider2_AccountRemovalTest.java
old mode 100644
new mode 100755
index f700220..cdb3546
--- a/tests/tests/provider/src/android/provider/cts/ContactsProvider2_AccountRemovalTest.java
+++ b/tests/tests/provider/src/android/provider/cts/ContactsProvider2_AccountRemovalTest.java
@@ -113,6 +113,7 @@
*/
public void testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated() {
mAccountManager.addAccountExplicitly(ACCT_1, null, null);
+ mAccountManager.addAccountExplicitly(ACCT_2, null, null);
ArrayList<ContactIdPair> idList = createAndAssertMergedContact(ACCT_1, ACCT_2);
long contactId = idList.get(0).mContactId;
@@ -125,6 +126,7 @@
"Contact " + contactId + " last updated timestamp has not been updated.");
SystemClock.sleep(SLEEP_BETWEEN_POLL_MS);
}
+ mAccountManager.removeAccount(ACCT_2, null, null);
}
public void testAccountRemovalWithMergedContact_hasDeleteLogsForContacts() {
