summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Powell <adamp@google.com> 2011-07-06 23:18:25 -0700
committer Adam Powell <adamp@google.com> 2011-07-06 23:18:25 -0700
commit2c742c2aebf20a0534c822eb8a36da99d9df79fe (patch)
tree4fc4ad02986a86a80067092ee35d15e2d5983c63
parenta72ef62e5c329a19eab9935acba816fc1369c637 (diff)
Fix bug 5000009 - NPE in Phone UI
Change-Id: I9c5c2c73b340192d754949865b6e4ee4a9a324ff
-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 {