commit c73d8100d22d5ece6a261f480c78a7c2127037a9
author Daniel Xie <dxie@google.com> Wed Jul 15 00:08:50 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 15 00:08:50 2015 +0000
tree b29d3b0d8ab26736a0d5f1bb5f0c9f359d081886
parent 09c6bcfb2ef6388efe24b870a42180dd7dc83d8b
parent fcd7cb7383d53228a7e58f4f209c9980bcd6029c

Merge "Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fail issue" into jb-mr2-cts-dev
automerge: fcd7cb7

* commit 'fcd7cb7383d53228a7e58f4f209c9980bcd6029c':
  Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fail issue

tests/tests/provider/src/android/provider/cts/ContactsProvider2_AccountRemovalTest.java

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() {