summaryrefslogtreecommitdiff
path: root/core/java/android/widget/GridView.java
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2009-09-28 13:42:20 -0700
committerRomain Guy <romainguy@android.com>2009-09-28 13:45:00 -0700
commitb4c547a56caebb5900c132ec9d5ce953f89de14f (patch)
tree176d673e7a7959404f12bc35675282be73e11cd0 /core/java/android/widget/GridView.java
parentaef439e6f825c0cb99a2ac08c8207f48b7a9fe10 (diff)
Fix possible NPE in AbsListView.positionSelector().
ListView was being reckless and calling the method with a null object in some situations. Change-Id: Ibb595a1ff6f916c699e4af55450966dd7fd8c156
Diffstat (limited to 'core/java/android/widget/GridView.java')
-rw-r--r--core/java/android/widget/GridView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java
index ce07f7a111b9..70555dca081e 100644
--- a/core/java/android/widget/GridView.java
+++ b/core/java/android/widget/GridView.java
@@ -1150,7 +1150,7 @@ public class GridView extends AbsListView {
mSelectedTop = sel.getTop();
} else if (mTouchMode > TOUCH_MODE_DOWN && mTouchMode < TOUCH_MODE_SCROLL) {
View child = getChildAt(mMotionPosition - mFirstPosition);
- positionSelector(child);
+ if (child != null) positionSelector(child);
} else {
mSelectedTop = 0;
mSelectorRect.setEmpty();