Overflow popup menu may be null when overflow menu button is not null

When updating options menu, if mOverflowMenuButton was not null, we
skip intialization of mOverflowPopupMenu, causing mOverflowPopupMenu to
stay null. This caused issues on rotation.

Ticket FEIJ-241

Change-Id: I3dc050ffdc3c85e8ccca08ed99943f15ec915856

1 files changed, 5 insertions, 2 deletions

diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index 1c8e02761..0b2c901d4 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -806,10 +806,13 @@ public class DialpadFragment extends Fragment
             if (mOverflowMenuButton == null) {
                 return;
             }
+        }
+        if (mOverflowPopupMenu == null) {
             mOverflowPopupMenu = buildOptionsMenu(mOverflowMenuButton);
-            mOverflowMenuButton.setOnTouchListener(mOverflowPopupMenu.getDragToOpenListener());
-            mOverflowMenuButton.setOnClickListener(this);
         }
+
+        mOverflowMenuButton.setOnTouchListener(mOverflowPopupMenu.getDragToOpenListener());
+        mOverflowMenuButton.setOnClickListener(this);
         mOverflowMenuButton.setVisibility(isDigitsEmpty() ||
                 (mCurrentCallMethodInfo != null && mCurrentCallMethodInfo.mIsInCallProvider) ?
                 View.INVISIBLE : View.VISIBLE);