diff options
| author | Erica Chang <echang@cyngn.com> | 2016-06-29 18:39:50 -0700 |
|---|---|---|
| committer | Erica Chang <echang@cyngn.com> | 2016-06-29 18:39:50 -0700 |
| commit | 04561babaa6f6264c7e326450deea74df8b22fec (patch) | |
| tree | cc7b17300ae8380df4029ed50ccdd0db857adc07 | |
| parent | c6eb605e37006fa9ac35f1eabfb4ceeae796cfbd (diff) | |
| download | packages_apps_Contacts-04561babaa6f6264c7e326450deea74df8b22fec.tar.gz packages_apps_Contacts-04561babaa6f6264c7e326450deea74df8b22fec.tar.bz2 packages_apps_Contacts-04561babaa6f6264c7e326450deea74df8b22fec.zip | |
Contacts metrics: flip contacts merge order since they have dependency
CONTACTS_AUTO_MERGE needs to insert before CONTACTS_MANUAL_MERGE
since it checks for the existence of a CONTACTS_MANUAL_MERGE with the
same rawId entries (a manual contact merge would trigger the same code
path in Contacts Content Provider as an auto merge, so this check is needed)
Issue-Id: CD-501
Change-Id: I5716cdf142c38a2967f38c7b541bbbfeeebe178b
| -rw-r--r-- | androidTest/src/com/android/contacts/androidtest/InCallMetricsSendTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/androidTest/src/com/android/contacts/androidtest/InCallMetricsSendTest.java b/androidTest/src/com/android/contacts/androidtest/InCallMetricsSendTest.java index 2783d01b6..6ca2dc032 100644 --- a/androidTest/src/com/android/contacts/androidtest/InCallMetricsSendTest.java +++ b/androidTest/src/com/android/contacts/androidtest/InCallMetricsSendTest.java @@ -79,18 +79,18 @@ public class InCallMetricsSendTest { private void populateMetricsInDb() { // Category: USER_ACTIONS - // CONTACTS_MANUAL_MERGED + // CONTACTS_AUTO_MERGED InCallMetricsDbHelper.getInstance(mContext).incrementUserActionsParam( mCm.mComponent.flattenToString(), "", - InCallMetricsHelper.Events.CONTACTS_MANUAL_MERGED.value(), + InCallMetricsHelper.Events.CONTACTS_AUTO_MERGED.value(), InCallMetricsHelper.Categories.USER_ACTIONS.value(), InCallMetricsHelper.Parameters.COUNT.toCol()); - // CONTACTS_AUTO_MERGED + // CONTACTS_MANUAL_MERGED InCallMetricsDbHelper.getInstance(mContext).incrementUserActionsParam( mCm.mComponent.flattenToString(), "", - InCallMetricsHelper.Events.CONTACTS_AUTO_MERGED.value(), + InCallMetricsHelper.Events.CONTACTS_MANUAL_MERGED.value(), InCallMetricsHelper.Categories.USER_ACTIONS.value(), InCallMetricsHelper.Parameters.COUNT.toCol()); // INVITES_SENT |