diff options
author | Makoto Onuki <omakoto@google.com> | 2017-07-06 15:52:01 -0700 |
---|---|---|
committer | Makoto Onuki <omakoto@google.com> | 2017-07-06 16:29:55 -0700 |
commit | 517d590dc73e5efcf7c94e2431faec2473924ca2 (patch) | |
tree | e0dcc506f5f15a898b8a239310383f39f006ed10 /tests/src/com/android/providers/contacts/aggregation/ContactAggregator2Test.java | |
parent | 6b5be2607fdef8f2d9b849d6df78426e607f426e (diff) | |
download | ContactsProvider-517d590dc73e5efcf7c94e2431faec2473924ca2.tar.gz |
Make CP2 low-ram friendly
- Switch to ArrayMap|Set
- No common nickname DB on lowram devices
- Don't use WAL for profile DB, ever
- Don't use WAL for contacts2.db on lowram devices
Bug 63340057
Test: adb shell am instrument -w -e package android.provider.cts.contacts \
android.provider.cts/android.support.test.runner.AndroidJUnitRunner
Test: bit ContactsProviderTests
Change-Id: I16a6b41762874590c487ac82020bd1da7d7c0a0a
Diffstat (limited to 'tests/src/com/android/providers/contacts/aggregation/ContactAggregator2Test.java')
-rw-r--r-- | tests/src/com/android/providers/contacts/aggregation/ContactAggregator2Test.java | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tests/src/com/android/providers/contacts/aggregation/ContactAggregator2Test.java b/tests/src/com/android/providers/contacts/aggregation/ContactAggregator2Test.java index 9839f8e7..927b215c 100644 --- a/tests/src/com/android/providers/contacts/aggregation/ContactAggregator2Test.java +++ b/tests/src/com/android/providers/contacts/aggregation/ContactAggregator2Test.java @@ -17,6 +17,7 @@ package com.android.providers.contacts.aggregation; import android.accounts.Account; +import android.app.ActivityManager; import android.content.ContentProviderOperation; import android.content.ContentProviderResult; import android.content.ContentUris; @@ -412,7 +413,12 @@ public class ContactAggregator2Test extends BaseContactsProvider2Test { long rawContactId2 = RawContactUtil.createRawContact(mResolver, ACCOUNT_2); DataUtil.insertStructuredName(mResolver, rawContactId2, "William", "Gore"); - assertAggregated(rawContactId1, rawContactId2, "William Gore"); + if (ActivityManager.isLowRamDeviceStatic()) { + // No common nickname DB on lowram devices. + assertNotAggregated(rawContactId1, rawContactId2); + } else { + assertAggregated(rawContactId1, rawContactId2, "William Gore"); + } } public void testAggregationByCommonNicknameOnly() { @@ -422,7 +428,12 @@ public class ContactAggregator2Test extends BaseContactsProvider2Test { long rawContactId2 = RawContactUtil.createRawContact(mResolver, ACCOUNT_2); DataUtil.insertStructuredName(mResolver, rawContactId2, "Larry", null); - assertAggregated(rawContactId1, rawContactId2, "Lawrence"); + if (ActivityManager.isLowRamDeviceStatic()) { + // No common nickname DB on lowram devices. + assertNotAggregated(rawContactId1, rawContactId2); + } else { + assertAggregated(rawContactId1, rawContactId2, "Lawrence"); + } } public void testAggregationByNicknameNoStructuredNameWithinSameAccount() { |