From 5cd13265af66e72d9865cabb4b05bdb7791b54ef Mon Sep 17 00:00:00 2001
From: Chris Banes <chrisbanes@google.com>
Date: Mon, 19 Jan 2015 12:01:46 +0000
Subject: [PATCH] Fix NPE in ActionMenuView when there isn't a presenter

BUG: 19060917
Change-Id: I5d63aa6e85238ea7cec6faf60d444c98bc583293
---
 core/java/android/widget/ActionMenuView.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/java/android/widget/ActionMenuView.java b/core/java/android/widget/ActionMenuView.java
index e5b6995e7a37b..403e4accbd1c3 100644
--- a/core/java/android/widget/ActionMenuView.java
+++ b/core/java/android/widget/ActionMenuView.java
@@ -116,11 +116,14 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        mPresenter.updateMenuView(false);
 
-        if (mPresenter != null && mPresenter.isOverflowMenuShowing()) {
-            mPresenter.hideOverflowMenu();
-            mPresenter.showOverflowMenu();
+        if (mPresenter != null) {
+            mPresenter.updateMenuView(false);
+
+            if (mPresenter.isOverflowMenuShowing()) {
+                mPresenter.hideOverflowMenu();
+                mPresenter.showOverflowMenu();
+            }
         }
     }