summaryrefslogtreecommitdiffstats
path: root/java/com/android/contacts
diff options
context:
space:
mode:
authorzachh <zachh@google.com>2017-09-29 11:11:01 -0700
committerEric Erfanian <erfanian@google.com>2017-10-03 10:38:00 -0700
commitf29d22e97bbbd6e3201c0347e48503e40309253e (patch)
treed89058813205107a15c59c7673413c3c0b457009 /java/com/android/contacts
parent0c396de3c969d42cdd2a2d93280f6567b5295aae (diff)
downloadandroid_packages_apps_Dialer-f29d22e97bbbd6e3201c0347e48503e40309253e.tar.gz
android_packages_apps_Dialer-f29d22e97bbbd6e3201c0347e48503e40309253e.tar.bz2
android_packages_apps_Dialer-f29d22e97bbbd6e3201c0347e48503e40309253e.zip
Warmup shared prefs in googledialer when strict mode is enabled.
This avoid some spurious strict mode violations. Test: observed no strict mode notification launching google dialer PiperOrigin-RevId: 170505918 Change-Id: Ie48671dcd306ea18b041a0bd7989b419bab903f5
Diffstat (limited to 'java/com/android/contacts')
-rw-r--r--java/com/android/contacts/common/list/PhoneNumberListAdapter.java17
1 files changed, 13 insertions, 4 deletions
diff --git a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java
index 741e606ac..8cf54b96c 100644
--- a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java
+++ b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java
@@ -42,6 +42,7 @@ import com.android.contacts.common.preference.ContactsPreferences;
import com.android.contacts.common.util.Constants;
import com.android.dialer.common.LogUtil;
import com.android.dialer.compat.CompatUtils;
+import com.android.dialer.configprovider.ConfigProviderBindings;
import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest;
import com.android.dialer.dialercontact.DialerContact;
import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
@@ -500,14 +501,22 @@ public class PhoneNumberListAdapter extends ContactEntryListAdapter {
if (getDirectorySearchMode() == DirectoryListLoader.SEARCH_MODE_NONE) {
return;
}
- final int numExtendedDirectories = mExtendedDirectories.size();
+ int numExtendedDirectories = mExtendedDirectories.size();
+
+ if (ConfigProviderBindings.get(getContext()).getBoolean("p13n_ranker_should_enable", false)) {
+ // Suggested results wasn't formulated as an extended directory, so manually
+ // increment the count here when the feature is enabled. Suggestions are
+ // only shown when the ranker is enabled.
+ numExtendedDirectories++;
+ }
+
if (getPartitionCount() == cursor.getCount() + numExtendedDirectories) {
// already added all directories;
return;
}
- //
+
mFirstExtendedDirectoryId = Long.MAX_VALUE;
- if (numExtendedDirectories > 0) {
+ if (!mExtendedDirectories.isEmpty()) {
// The Directory.LOCAL_INVISIBLE is not in the cursor but we can't reuse it's
// "special" ID.
long maxId = Directory.LOCAL_INVISIBLE;
@@ -527,7 +536,7 @@ public class PhoneNumberListAdapter extends ContactEntryListAdapter {
}
// Extended directories ID's cannot collide with base directories
mFirstExtendedDirectoryId = maxId + 1;
- for (int i = 0; i < numExtendedDirectories; i++) {
+ for (int i = 0; i < mExtendedDirectories.size(); i++) {
final long id = mFirstExtendedDirectoryId + i;
final DirectoryPartition directory = mExtendedDirectories.get(i);
if (getPartitionByDirectoryId(id) == -1) {