diff options
| author | Pawel Bochenski <pawel.bochenski2@sonymobile.com> | 2013-02-20 09:17:35 +0100 |
|---|---|---|
| committer | Henrik Baard <henrik.baard@sonymobile.com> | 2013-07-02 09:45:53 +0200 |
| commit | 7bf15e8a3e6badb4cf81db7e89299b8840df5843 (patch) | |
| tree | f65ca002300bc9b1fdc3747e2018270450546cff /src/com/android | |
| parent | 6fae8a98d19492a44a63bcc2ae3863f33cf1a3df (diff) | |
| download | packages_apps_Browser-7bf15e8a3e6badb4cf81db7e89299b8840df5843.tar.gz packages_apps_Browser-7bf15e8a3e6badb4cf81db7e89299b8840df5843.tar.bz2 packages_apps_Browser-7bf15e8a3e6badb4cf81db7e89299b8840df5843.zip | |
NPE in bookmark grid when using mouse
When using a mouse and right clicking on an empty
element element in the bookmark grid an NPE ocurrs.
Patch fixes crash after click right button on the mouse
in bookmark screen, by adding null pointer check.
Change-Id: I07af747797411176e9fd9473eb2dbfe4404e58f5
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/browser/view/BookmarkExpandableView.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/browser/view/BookmarkExpandableView.java b/src/com/android/browser/view/BookmarkExpandableView.java index 7badaf52b..5f8601b92 100644 --- a/src/com/android/browser/view/BookmarkExpandableView.java +++ b/src/com/android/browser/view/BookmarkExpandableView.java @@ -183,11 +183,14 @@ public class BookmarkExpandableView extends ExpandableListView @Override public boolean showContextMenuForChild(View originalView) { - int groupPosition = (Integer) originalView.getTag(R.id.group_position); - int childPosition = (Integer) originalView.getTag(R.id.child_position); + Integer groupPosition = (Integer) originalView.getTag(R.id.group_position); + Integer childPosition = (Integer) originalView.getTag(R.id.child_position); - mContextMenuInfo = new BookmarkContextMenuInfo(childPosition, - groupPosition); + if (groupPosition == null || childPosition == null) { + return false; + } + + mContextMenuInfo = new BookmarkContextMenuInfo(childPosition, groupPosition); if (getParent() != null) { getParent().showContextMenuForChild(this); } |