am 4c72ad75: Merge "Fix bug 2918587 Infinite loop and memory leak in AdapterView" into gingerbread
Merge commit '4c72ad75cfb413f54cb59d413a232e77c7260ef2' into gingerbread-plus-aosp
* commit '4c72ad75cfb413f54cb59d413a232e77c7260ef2':
Fix bug 2918587 Infinite loop and memory leak in AdapterView
diff --git a/core/java/android/widget/AdapterView.java b/core/java/android/widget/AdapterView.java
index 10a8729..8fcc2e8 100644
--- a/core/java/android/widget/AdapterView.java
+++ b/core/java/android/widget/AdapterView.java
@@ -808,7 +808,6 @@
mNextSelectedPosition = INVALID_POSITION;
mNextSelectedRowId = INVALID_ROW_ID;
mNeedSync = false;
- checkSelectionChanged();
checkFocus();
requestLayout();
@@ -819,13 +818,21 @@
}
}
- private class SelectionNotifier extends Handler implements Runnable {
+ @Override
+ protected void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+ removeCallbacks(mSelectionNotifier);
+ }
+
+ private class SelectionNotifier implements Runnable {
public void run() {
if (mDataChanged) {
// Data has changed between when this SelectionNotifier
// was posted and now. We need to wait until the AdapterView
// has been synched to the new data.
- post(this);
+ if (getAdapter() != null) {
+ post(this);
+ }
} else {
fireOnSelected();
}
@@ -842,7 +849,7 @@
if (mSelectionNotifier == null) {
mSelectionNotifier = new SelectionNotifier();
}
- mSelectionNotifier.post(mSelectionNotifier);
+ post(mSelectionNotifier);
} else {
fireOnSelected();
}