Merge "Dialer: fix memory leak in DialpadFragment"

1 files changed, 7 insertions, 9 deletions

diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index 2e2b27d1a..b497f3736 100755
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -396,6 +396,13 @@ public class DialpadFragment extends AnalyticsFragment
             mDelete.setOnLongClickListener(this);
         }
 
+        // Populate the overflow menu in onCreate instead of onResume to avoid PopupMenu's memory leak.
+        mOverflowMenuButton = mDialpadView.getOverflowMenuButton();
+        mOverflowPopupMenu = buildOptionsMenu(mOverflowMenuButton);
+        mOverflowMenuButton.setOnTouchListener(mOverflowPopupMenu.getDragToOpenListener());
+        mOverflowMenuButton.setOnClickListener(this);
+        mOverflowMenuButton.setVisibility(isDigitsEmpty() ? View.INVISIBLE : View.VISIBLE);
+
         mSpacer = fragmentView.findViewById(R.id.spacer);
         mSpacer.setOnTouchListener(new View.OnTouchListener() {
             @Override
@@ -709,15 +716,6 @@ public class DialpadFragment extends AnalyticsFragment
 
         mSmsPackageComponentName = DialerUtils.getSmsComponent(activity);
 
-        // Populate the overflow menu in onResume instead of onCreate, so that if the SMS activity
-        // is disabled while Dialer is paused, the "Send a text message" option can be correctly
-        // removed when resumed.
-        mOverflowMenuButton = mDialpadView.getOverflowMenuButton();
-        mOverflowPopupMenu = buildOptionsMenu(mOverflowMenuButton);
-        mOverflowMenuButton.setOnTouchListener(mOverflowPopupMenu.getDragToOpenListener());
-        mOverflowMenuButton.setOnClickListener(this);
-        mOverflowMenuButton.setVisibility(isDigitsEmpty() ? View.INVISIBLE : View.VISIBLE);
-
         if (getTelephonyManager().isMultiSimEnabled() &&
                 MoreContactUtils.shouldShowOperator(mContext)) {
             if (SubscriptionManager.isVoicePromptEnabled()) {