Merge change 962 into donut

* changes:
  Fixes #1603191. GridView could provoke NPEs during layout passes initiated from key events.

1 files changed, 2 insertions, 2 deletions

diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java
index 11fab8f96a22..9ec8347e4647 100644
--- a/core/java/android/widget/GridView.java
+++ b/core/java/android/widget/GridView.java
@@ -1534,14 +1534,14 @@ public class GridView extends AbsListView {
             case FOCUS_LEFT:
                 if (selectedPosition > startOfRowPos) {
                     mLayoutMode = LAYOUT_MOVE_SELECTION;
-                    setSelectionInt(selectedPosition - 1);
+                    setSelectionInt(Math.max(0, selectedPosition - 1));
                     moved = true;
                 }
                 break;
             case FOCUS_RIGHT:
                 if (selectedPosition < endOfRowPos) {
                     mLayoutMode = LAYOUT_MOVE_SELECTION;
-                    setSelectionInt(selectedPosition + 1);
+                    setSelectionInt(Math.min(selectedPosition + 1, mItemCount - 1));
                     moved = true;
                 }
                 break;