| commit | e782c871e09866196012f6646745bb54b91540ef | [log] [tgz] |
|---|---|---|
| author | Chris Banes <chrisbanes@google.com> | Tue Sep 29 11:14:27 2015 +0100 |
| committer | Chris Banes <chrisbanes@google.com> | Tue Sep 29 11:14:27 2015 +0100 |
| tree | 86cd6676913ad9b27e9cabc033d56dfae7c5caee | |
| parent | e95a79a84dda1d3235601887a4500eb515bd4510 [diff] |
Fix possible NPE in MenuItemImpl.toString() BUG: 24474852 Change-Id: If3089d5f140d753145f5b75b50b0f9402c5756ba
diff --git a/v7/appcompat/src/android/support/v7/internal/view/menu/MenuItemImpl.java b/v7/appcompat/src/android/support/v7/internal/view/menu/MenuItemImpl.java index ffddb31..ed2afc0 100644 --- a/v7/appcompat/src/android/support/v7/internal/view/menu/MenuItemImpl.java +++ b/v7/appcompat/src/android/support/v7/internal/view/menu/MenuItemImpl.java
@@ -538,7 +538,7 @@ @Override public String toString() { - return mTitle.toString(); + return mTitle != null ? mTitle.toString() : null; } void setMenuInfo(ContextMenuInfo menuInfo) {