summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Scott <stuartscott@google.com>2014-03-17 16:37:31 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-03-17 16:37:31 +0000
commit5ff10710fcd4f3e2216f263e34c934db03b001ae (patch)
tree6d204626b504de1335ad3eba1ae004584632ef3f
parent0ec99048adf2622b6552172f0907b3f6f9c89419 (diff)
parent35920d0f3ce0d147f3a8d0dc1f2518e1bf8a7631 (diff)
downloadcts-5ff10710fcd4f3e2216f263e34c934db03b001ae.tar.gz
Merge "Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fail issue"
-rwxr-xr-x[-rw-r--r--]tests/tests/provider/src/android/provider/cts/ContactsProvider2_AccountRemovalTest.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsProvider2_AccountRemovalTest.java b/tests/tests/provider/src/android/provider/cts/ContactsProvider2_AccountRemovalTest.java
index f700220c5eb..cdb3546715c 100644..100755
--- 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 class ContactsProvider2_AccountRemovalTest extends AndroidTestCase {
*/
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 @@ public class ContactsProvider2_AccountRemovalTest extends AndroidTestCase {
"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() {