commit e00b10a7572f63443aecc239133930aebb470d2f
author Chet Haase <chet@google.com> Wed Jul 15 02:55:58 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 15 02:55:58 2015 +0000
tree 16700099b89e511751ed747322c0cb566af2d170
parent 8855f0e81a9c469a51960695f8cc37d6cddaa6fd
parent c56923d09cf8292c2b415310698524ebca5b9d5f

am c56923d0: am fc48292f: am 0c0b57d3: Merge "Fix AbsListViewTest.testSetOnScrollListener()" into mnc-dev

* commit 'c56923d09cf8292c2b415310698524ebca5b9d5f':
  Fix AbsListViewTest.testSetOnScrollListener()

tests/tests/widget/src/android/widget/cts/AbsListViewTest.java

diff --git a/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java b/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java
index 9d8c7d2..70c31d6 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java
@@ -194,7 +194,6 @@
         assertSame(mListView, onScrollListener.getView());
         assertEquals(mListView.getChildCount(), onScrollListener.getVisibleItemCount());
         assertEquals(mCountryList.length, onScrollListener.getTotalItemCount());
-        assertEquals(OnScrollListener.SCROLL_STATE_IDLE, onScrollListener.getScrollState());
 
         assertTrue(onScrollListener.isOnScrollCalled());
         assertTrue(onScrollListener.isOnScrollStateChangedCalled());