1 files changed, 36 insertions, 2 deletions
diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlacesCursorLoader.java b/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlacesCursorLoader.java
index 6807a6e6b..c8bb36a73 100644
--- a/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlacesCursorLoader.java
+++ b/java/com/android/dialer/searchfragment/nearbyplaces/NearbyPlacesCursorLoader.java
@@ -21,21 +21,37 @@ import android.content.CursorLoader;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.ContactsContract;
+import android.support.annotation.NonNull;
 import com.android.contacts.common.extensions.PhoneDirectoryExtenderAccessor;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.searchfragment.common.Projections;
+import java.util.List;
 
 /** Cursor loader for nearby places search results. */
 public final class NearbyPlacesCursorLoader extends CursorLoader {
 
   private static final String MAX_RESULTS = "3";
+  private static final long INVALID_DIRECTORY_ID = Long.MAX_VALUE;
+  private final long directoryId;
 
-  public NearbyPlacesCursorLoader(Context context, String query) {
+  /**
+   * @param directoryIds List of directoryIds associated with all directories on device. Required in
+   *     order to find a directory ID for the nearby places cursor that doesn't collide with
+   *     existing directories.
+   */
+  public NearbyPlacesCursorLoader(
+      Context context, String query, @NonNull List<Integer> directoryIds) {
     super(context, getContentUri(context, query), Projections.PHONE_PROJECTION, null, null, null);
+    this.directoryId = getDirectoryId(directoryIds);
   }
 
   @Override
   public Cursor loadInBackground() {
-    return NearbyPlacesCursor.newInstnace(getContext(), super.loadInBackground());
+    if (directoryId == INVALID_DIRECTORY_ID) {
+      LogUtil.i("NearbyPlacesCursorLoader.loadInBackground", "directory id not set.");
+      return null;
+    }
+    return NearbyPlacesCursor.newInstance(getContext(), super.loadInBackground(), directoryId);
   }
 
   private static Uri getContentUri(Context context, String query) {
@@ -46,4 +62,22 @@ public final class NearbyPlacesCursorLoader extends CursorLoader {
         .appendQueryParameter(ContactsContract.LIMIT_PARAM_KEY, MAX_RESULTS)
         .build();
   }
+
+  private static long getDirectoryId(List<Integer> directoryIds) {
+    if (directoryIds.isEmpty()) {
+      return INVALID_DIRECTORY_ID;
+    }
+
+    // The Directory.LOCAL_INVISIBLE might not be a directory we use, but we can't reuse it's
+    // "special" ID.
+    long maxId = ContactsContract.Directory.LOCAL_INVISIBLE;
+    for (int i = 0, n = directoryIds.size(); i < n; i++) {
+      long id = directoryIds.get(i);
+      if (id > maxId) {
+        maxId = id;
+      }
+    }
+    // Add one so that the nearby places ID doesn't collide with extended directory IDs.
+    return maxId + 1;
+  }
 }