Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 962 into donut

Browse Source 
* changes:
  Fixes #1603191. GridView could provoke NPEs during layout passes initiated from key events.
This commit is contained in:
Android (Google) Code Review
2009-05-04 16:59:12 -07:00
parent 2c9eec6b1d 51d154b82b
commit b7ce28c64c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/GridView.java
View File

@@ -1534,14 +1534,14 @@ public class GridView extends AbsListView {
case FOCUS_LEFT: case FOCUS_LEFT:
if (selectedPosition > startOfRowPos) { if (selectedPosition > startOfRowPos) {
mLayoutMode = LAYOUT_MOVE_SELECTION; mLayoutMode = LAYOUT_MOVE_SELECTION;
setSelectionInt(selectedPosition - 1); setSelectionInt(Math.max(0, selectedPosition - 1));
moved = true; moved = true;
} }
break; break;
case FOCUS_RIGHT: case FOCUS_RIGHT:
if (selectedPosition < endOfRowPos) { if (selectedPosition < endOfRowPos) {
mLayoutMode = LAYOUT_MOVE_SELECTION; mLayoutMode = LAYOUT_MOVE_SELECTION;
setSelectionInt(selectedPosition + 1); setSelectionInt(Math.min(selectedPosition + 1, mItemCount - 1));
moved = true; moved = true;
} }
break; break;