summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/com/android/internal/view/menu/ActionMenuItemView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/view/menu/ActionMenuItemView.java b/core/java/com/android/internal/view/menu/ActionMenuItemView.java
index 520ea71037a5..3b497e46f3c5 100644
--- a/core/java/com/android/internal/view/menu/ActionMenuItemView.java
+++ b/core/java/com/android/internal/view/menu/ActionMenuItemView.java
@@ -154,7 +154,7 @@ public class ActionMenuItemView extends LinearLayout
// populate accessibility description with title
setContentDescription(title);
- if (mShowTextAllCaps) {
+ if (mShowTextAllCaps && title != null) {
mTextButton.setText(title.toString().toUpperCase(
getContext().getResources().getConfiguration().locale));
} else {