summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-08-01 17:20:06 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-01 17:20:06 -0700
commitb1eaf8f5527a7d587cf1e3feedd9638ea8370d18 (patch)
tree441ac627d7bba6d861245fb7a95555f51191112f /api
parent34e1fb1ee229a7e033dcd42f4efd194e1614d5ce (diff)
parentf0f5fffc6f578f531df7b208cfbfb53f884c0380 (diff)
downloadframeworks_base-b1eaf8f5527a7d587cf1e3feedd9638ea8370d18.zip
frameworks_base-b1eaf8f5527a7d587cf1e3feedd9638ea8370d18.tar.gz
frameworks_base-b1eaf8f5527a7d587cf1e3feedd9638ea8370d18.tar.bz2
Merge "Fix bug 5090996 - Crash on tapping Menu on dial pad"
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 7cb3bfb..7d0503d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -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);