diff options
| author | Tun Zheng <peterzheng@google.com> | 2017-10-12 11:56:50 -0700 |
|---|---|---|
| committer | Tun Zheng <peterzheng@google.com> | 2017-10-12 21:55:54 +0000 |
| commit | 670ceded12e09219c41f4931b23d1baab6ab2fb0 (patch) | |
| tree | 7a29c0cf41cead45fd3e2cd9ee5243c93646583a /core/java | |
| parent | 60d548786e5521d819c9eadeaa34fcffe36c45ff (diff) | |
Fix group divider make chrome crash issue.
ListMenuItemView's group divider is only existed in
popup_menu_item_layout, but Chrome use list_menu_item_layout.
It will make NullPointerException and crash the chrome.
Fix it by check null before using the group divider.
Bug: 66987086
Test: Long click an image from webpage in chrome, click the "Download
image" item, and it works well.
Change-Id: Ie5f19194a968b4fff0126e1cf8bebda5344c8105
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/view/menu/ListMenuItemView.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/com/android/internal/view/menu/ListMenuItemView.java b/core/java/com/android/internal/view/menu/ListMenuItemView.java index f76c7247aba9..8f80bfe3fb50 100644 --- a/core/java/com/android/internal/view/menu/ListMenuItemView.java +++ b/core/java/com/android/internal/view/menu/ListMenuItemView.java @@ -319,13 +319,15 @@ public class ListMenuItemView extends LinearLayout public void setGroupDividerEnabled(boolean groupDividerEnabled) { // If mHasListDivider is true, disabling the groupDivider. // Otherwise, checking enbling it according to groupDividerEnabled flag. - mGroupDivider.setVisibility(!mHasListDivider - && groupDividerEnabled ? View.VISIBLE : View.GONE); + if (mGroupDivider != null) { + mGroupDivider.setVisibility(!mHasListDivider + && groupDividerEnabled ? View.VISIBLE : View.GONE); + } } @Override public void adjustListItemSelectionBounds(Rect rect) { - if (mGroupDivider.getVisibility() == View.VISIBLE) { + if (mGroupDivider != null && mGroupDivider.getVisibility() == View.VISIBLE) { // groupDivider is a part of MenuItemListView. // If ListMenuItem with divider enabled is hovered/clicked, divider also gets selected. // Clipping the selector bounds from the top divider portion when divider is enabled, |