diff options
| -rw-r--r-- | src/com/android/dialer/calllog/GroupingListAdapter.java | 14 | ||||
| -rw-r--r-- | tests/src/com/android/dialer/calllog/CallLogFragmentTest.java | 10 |
2 files changed, 8 insertions, 16 deletions
diff --git a/src/com/android/dialer/calllog/GroupingListAdapter.java b/src/com/android/dialer/calllog/GroupingListAdapter.java index 501e88df0..8d3ab4545 100644 --- a/src/com/android/dialer/calllog/GroupingListAdapter.java +++ b/src/com/android/dialer/calllog/GroupingListAdapter.java @@ -253,7 +253,6 @@ abstract class GroupingListAdapter extends RecyclerView.Adapter { * corresponding cursor position. */ public void obtainPositionMetadata(PositionMetadata metadata, int position) { - // If the description object already contains requested information, just return if (metadata.listPosition == position) { return; @@ -433,17 +432,4 @@ abstract class GroupingListAdapter extends RecyclerView.Adapter { return -1; } } - - /** - * Used for setting the cursor without triggering a UI thread update. - */ - @NeededForTesting - public void setCursorForTesting(Cursor cursor) { - if (cursor != null) { - mCursor = cursor; - cursor.registerContentObserver(mChangeObserver); - cursor.registerDataSetObserver(mDataSetObserver); - mRowIdColumnIndex = cursor.getColumnIndexOrThrow("_id"); - } - } } diff --git a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java index 71554d6e1..3f66d5848 100644 --- a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java +++ b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java @@ -129,7 +129,14 @@ public class CallLogFragmentTest extends ActivityInstrumentationTestCase2<Fragme mAdapter.pauseCache(); mParentView = new FrameLayout(mActivity); mCursor = new MatrixCursor(CallLogQuery._PROJECTION); - mAdapter.setCursorForTesting(mCursor); + + getInstrumentation().runOnMainSync(new Runnable() { + @Override + public void run() { + mAdapter.changeCursor(mCursor); + } + }); + getInstrumentation().waitForIdleSync(); } /** @@ -316,7 +323,6 @@ public class CallLogFragmentTest extends ActivityInstrumentationTestCase2<Fragme public void testBindView_CallButton() { mCursor.moveToFirst(); insert(TEST_NUMBER, Calls.PRESENTATION_ALLOWED, NOW, 0, Calls.INCOMING_TYPE); - mAdapter.changeCursor(mCursor); CallLogListItemViewHolder viewHolder = (CallLogListItemViewHolder) mAdapter.onCreateViewHolder(mParentView, /* viewType */ 0); bindViewForTest(viewHolder); |