diff options
author | zachh <zachh@google.com> | 2017-11-17 12:50:52 -0800 |
---|---|---|
committer | zachh <zachh@google.com> | 2017-11-18 07:35:42 +0000 |
commit | a430bba3873f556ba895b172a32048030fa7f4d0 (patch) | |
tree | f5f454ee37b10fd93191a93647fdba241fb5785c /java/com/android/dialer/searchfragment/list | |
parent | 7e1a0d155eecc8a407e11f91605db135911c8eb6 (diff) |
Automated rollback of changelist 174944384
Bug: 68942044
Test: NO
PiperOrigin-RevId: 176147553
Change-Id: Ia22751f02cdd621c2095e8e476a3077db2c541fa
Diffstat (limited to 'java/com/android/dialer/searchfragment/list')
-rw-r--r-- | java/com/android/dialer/searchfragment/list/SearchAdapter.java | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/java/com/android/dialer/searchfragment/list/SearchAdapter.java b/java/com/android/dialer/searchfragment/list/SearchAdapter.java index 4254baece..17cab6db1 100644 --- a/java/com/android/dialer/searchfragment/list/SearchAdapter.java +++ b/java/com/android/dialer/searchfragment/list/SearchAdapter.java @@ -17,7 +17,6 @@ package com.android.dialer.searchfragment.list; import android.content.Context; -import android.database.Cursor; import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.support.v7.widget.RecyclerView; @@ -28,15 +27,12 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import com.android.dialer.common.Assert; -import com.android.dialer.common.LogUtil; -import com.android.dialer.searchfragment.common.Projections; import com.android.dialer.searchfragment.common.RowClickListener; import com.android.dialer.searchfragment.common.SearchCursor; import com.android.dialer.searchfragment.cp2.SearchContactViewHolder; import com.android.dialer.searchfragment.list.SearchCursorManager.RowType; import com.android.dialer.searchfragment.nearbyplaces.NearbyPlaceViewHolder; import com.android.dialer.searchfragment.remote.RemoteContactViewHolder; -import com.android.dialer.searchfragment.remote.RemoteDirectoriesCursorLoader; import java.util.List; /** RecyclerView adapter for {@link NewSearchFragment}. */ @@ -107,23 +103,6 @@ public final class SearchAdapter extends RecyclerView.Adapter<ViewHolder> { } else if (holder instanceof NearbyPlaceViewHolder) { ((NearbyPlaceViewHolder) holder).bind(searchCursorManager.getCursor(position), query); } else if (holder instanceof RemoteContactViewHolder) { - Cursor cursor = searchCursorManager.getCursor(position); - // Temporary logging to identify cause of a bug: - if (cursor.getString(Projections.PHONE_NUMBER) == null) { - LogUtil.e( - "SearchAdapter.onBindViewHolder", "cursor class: %s", cursor.getClass().getName()); - LogUtil.e("SearchAdapter.onBindViewHolder", "position: %d", position); - LogUtil.e( - "SearchAdapter.onBindViewHolder", - "query length: %s", - query == null ? "null" : query.length()); - logDirectories(); - LogUtil.e( - "SearchAdapter.onBindViewHolder", - "directory id: %d", - ((SearchCursor) cursor).getDirectoryId()); - throw new IllegalStateException("Null phone number reading remote contact"); - } ((RemoteContactViewHolder) holder).bind(searchCursorManager.getCursor(position), query); } else if (holder instanceof HeaderViewHolder) { String header = @@ -142,21 +121,6 @@ public final class SearchAdapter extends RecyclerView.Adapter<ViewHolder> { } } - private void logDirectories() { - try (Cursor directories = new RemoteDirectoriesCursorLoader(context).loadInBackground()) { - if (directories.moveToFirst()) { - do { - LogUtil.e( - "SearchAdapter.logDirectories", - "directory: %s", - RemoteDirectoriesCursorLoader.readDirectory(directories)); - } while (directories.moveToNext()); - } else { - LogUtil.e("SearchAdapter.logDirectories", "no directories found"); - } - } - } - public void setContactsCursor(SearchCursor cursor) { if (searchCursorManager.setContactsCursor(cursor)) { // Since this is a new contacts cursor, we need to reapply the filter. |