commit cb923d99e9ec2f7b6b40a7c89c83a6caaa03b016
author Chet Haase <chet@google.com> Mon Jun 30 17:59:15 2014 -0700
committer Chet Haase <chet@google.com> Tue Jul 01 13:31:48 2014 +0000
tree d8464c96341fed8f891c1777c46e3186f4ae19d1
parent a70d1d99de6cdadd68176cb849c02d56b8536021

null-check before derefing title in MenuItemImpl

The toString() method in MenuItemImpl returns mTitle.toString(),
which crashes when the title is null (which it can be, since there
is no requirement that a title be non-null, and you can get one
by simply not assigning a title to begin with or by setting it
to null).

Issue #13420311 MenuItemImpl can't handle a null title

Change-Id: I701d1d565f1d254ffdd41ca64c1abaf2906edb79

core/java/com/android/internal/view/menu/MenuItemImpl.java

diff --git a/core/java/com/android/internal/view/menu/MenuItemImpl.java b/core/java/com/android/internal/view/menu/MenuItemImpl.java
index 61dcaca..3b1f20d 100644
--- a/core/java/com/android/internal/view/menu/MenuItemImpl.java
+++ b/core/java/com/android/internal/view/menu/MenuItemImpl.java
@@ -496,7 +496,7 @@
     
     @Override
     public String toString() {
-        return mTitle.toString();
+        return mTitle != null ? mTitle.toString() : null;
     }
 
     void setMenuInfo(ContextMenuInfo menuInfo) {