summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-11-19 12:08:34 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-19 12:08:34 -0800
commit7afe176a22d58dadac5785f8c4e8eaa292147825 (patch)
treeb736fa83b90a64f4ad27191283c882fb8b5cfcf0
parent030824eef9c9d9e6633a0c7c4bf510a4bcea7b77 (diff)
parent5e9d94505bd7d4e294bfe309db25e293164e2d29 (diff)
downloadframeworks_base-7afe176a22d58dadac5785f8c4e8eaa292147825.zip
frameworks_base-7afe176a22d58dadac5785f8c4e8eaa292147825.tar.gz
frameworks_base-7afe176a22d58dadac5785f8c4e8eaa292147825.tar.bz2
Merge "Fix AbsListView StrictMode.Span end point on flings."
-rw-r--r--core/java/android/widget/AbsListView.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index d388985..a3e9bc9 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -3018,6 +3018,11 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
reportScrollStateChange(OnScrollListener.SCROLL_STATE_IDLE);
clearScrollingCache();
mScroller.abortAnimation();
+
+ if (mFlingStrictSpan != null) {
+ mFlingStrictSpan.finish();
+ mFlingStrictSpan = null;
+ }
}
void flywheelTouch() {
@@ -3086,11 +3091,6 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
Debug.stopMethodTracing();
mFlingProfilingStarted = false;
}
-
- if (mFlingStrictSpan != null) {
- mFlingStrictSpan.finish();
- mFlingStrictSpan = null;
- }
}
}
}