Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1eaf8f5 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 5090996 - Crash on tapping Menu on dial pad"

parents 34e1fb1e f0f5fffc

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3072,6 +3072,7 @@ package android.app { 
    method public abstract android.app.FragmentManager.BackStackEntry getBackStackEntryAt(int);

    method public abstract int getBackStackEntryCount();

    method public abstract android.app.Fragment getFragment(android.os.Bundle, java.lang.String);

    method public void invalidateOptionsMenu();

    method public abstract void popBackStack();

    method public abstract void popBackStack(java.lang.String, int);

    method public abstract void popBackStack(int, int);

core/java/android/app/Fragment.java

+4 −4
Original line number Diff line number Diff line
@@ -30,14 +30,14 @@ import android.util.AttributeSet; 
import android.util.DebugUtils;

import android.util.SparseArray;

import android.view.ContextMenu;

import android.view.ContextMenu.ContextMenuInfo;

import android.view.LayoutInflater;

import android.view.Menu;

import android.view.MenuInflater;

import android.view.MenuItem;

import android.view.View;

import android.view.ViewGroup;

import android.view.ContextMenu.ContextMenuInfo;

import android.view.View.OnCreateContextMenuListener;

import android.view.ViewGroup;

import android.widget.AdapterView;



import java.io.FileDescriptor;
@@ -883,8 +883,8 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
    public void setHasOptionsMenu(boolean hasMenu) {

        if (mHasMenu != hasMenu) {

            mHasMenu = hasMenu;

            if (isAdded() && !isHidden() && isResumed()) {

                mActivity.invalidateOptionsMenu();

            if (isAdded() && !isHidden()) {

                mFragmentManager.invalidateOptionsMenu();

            }

        }

    }

core/java/android/app/FragmentManager.java

+16 −1
Original line number Diff line number Diff line
@@ -315,6 +315,12 @@ public abstract class FragmentManager { 
    public static void enableDebugLogging(boolean enabled) {

        FragmentManagerImpl.DEBUG = enabled;

    }



    /**

     * Invalidate the attached activity's options menu as necessary.

     * This may end up being deferred until we move to the resumed state.

     */

    public void invalidateOptionsMenu() { }

}



final class FragmentManagerState implements Parcelable {
@@ -1817,6 +1823,15 @@ final class FragmentManagerImpl extends FragmentManager { 
        }

    }



    @Override

    public void invalidateOptionsMenu() {

        if (mActivity != null && mCurState == Fragment.RESUMED) {

            mActivity.invalidateOptionsMenu();

        } else {

            mNeedMenuInvalidate = true;

        }

    }



    public static int reverseTransit(int transit) {

        int rev = 0;

        switch (transit) {