From c1eea136eaae62091b44d7b06a3d61ac694e4fd7 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Tue, 31 Jul 2012 11:27:19 -0700
Subject: [PATCH] Fix bug 6906134

Change-Id: I47dfa1e503e502fe348a350dad960fbb112435e7
---
 .../view/menu/ActionMenuItemView.java         | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/core/java/com/android/internal/view/menu/ActionMenuItemView.java b/core/java/com/android/internal/view/menu/ActionMenuItemView.java
index 96d486bb7717f..563effe52a7c9 100644
--- a/core/java/com/android/internal/view/menu/ActionMenuItemView.java
+++ b/core/java/com/android/internal/view/menu/ActionMenuItemView.java
@@ -141,19 +141,21 @@ public class ActionMenuItemView extends TextView
 
     public void setIcon(Drawable icon) {
         mIcon = icon;
-        int width = icon.getIntrinsicWidth();
-        int height = icon.getIntrinsicHeight();
-        if (width > mMaxIconSize) {
-            final float scale = (float) mMaxIconSize / width;
-            width = mMaxIconSize;
-            height *= scale;
+        if (icon != null) {
+            int width = icon.getIntrinsicWidth();
+            int height = icon.getIntrinsicHeight();
+            if (width > mMaxIconSize) {
+                final float scale = (float) mMaxIconSize / width;
+                width = mMaxIconSize;
+                height *= scale;
+            }
+            if (height > mMaxIconSize) {
+                final float scale = (float) mMaxIconSize / height;
+                height = mMaxIconSize;
+                width *= scale;
+            }
+            icon.setBounds(0, 0, width, height);
         }
-        if (height > mMaxIconSize) {
-            final float scale = (float) mMaxIconSize / height;
-            height = mMaxIconSize;
-            width *= scale;
-        }
-        icon.setBounds(0, 0, width, height);
         setCompoundDrawables(icon, null, null, null);
 
         updateTextButtonVisibility();