From 4eb475de8265a4d177580a137a6a7148aaec1380 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Mon, 12 Sep 2011 13:34:16 -0700
Subject: Add sanity checking to bookmark click listener

 Bug: 5296561
 Monkey manages to make the impossible happen - sanity check the state
 of the world.

Change-Id: Ibbe62e6bd564d98af570271fa834dc9472c06126
---
 src/com/android/browser/view/BookmarkExpandableView.java | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src')

diff --git a/src/com/android/browser/view/BookmarkExpandableView.java b/src/com/android/browser/view/BookmarkExpandableView.java
index 44a123a..4fb09c4 100644
--- a/src/com/android/browser/view/BookmarkExpandableView.java
+++ b/src/com/android/browser/view/BookmarkExpandableView.java
@@ -264,8 +264,15 @@ public class BookmarkExpandableView extends ExpandableListView
 
         @Override
         public void onClick(View v) {
+            if (v.getVisibility() != View.VISIBLE) {
+                return;
+            }
             int groupPosition = (Integer) v.getTag(R.id.group_position);
             int childPosition = (Integer) v.getTag(R.id.child_position);
+            if (mAdapter.getGroupCount() <= groupPosition
+                    || mAdapter.mChildren.get(groupPosition).getCount() <= childPosition) {
+                return;
+            }
             long id = (Long) v.getTag(R.id.child_id);
             if (mOnChildClickListener != null) {
                 mOnChildClickListener.onChildClick(BookmarkExpandableView.this,
-- 
cgit v1.1