summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Kennedy <toddke@google.com>2015-08-31 22:35:58 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-31 22:35:58 +0000
commite7078e181cd00d20ce7764efa9835e2604a3cb83 (patch)
treede65789ebf63fa00ba15184642340c6b95149c9e
parent627975fca234bfc62d60904547ba3fb2ac675ec8 (diff)
parent0aa69b7dc5706d0950d1d000de71437822e11bd9 (diff)
downloadframeworks_base-e7078e181cd00d20ce7764efa9835e2604a3cb83.zip
frameworks_base-e7078e181cd00d20ce7764efa9835e2604a3cb83.tar.gz
frameworks_base-e7078e181cd00d20ce7764efa9835e2604a3cb83.tar.bz2
Merge "Ensure host is set before onInflate()" into mnc-dev
-rw-r--r--core/java/android/app/FragmentManager.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java
index 3b026d2..132ffef 100644
--- a/core/java/android/app/FragmentManager.java
+++ b/core/java/android/app/FragmentManager.java
@@ -2196,6 +2196,7 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
fragment.mTag = tag;
fragment.mInLayout = true;
fragment.mFragmentManager = this;
+ fragment.mHost = mHost;
fragment.onInflate(mHost.getContext(), attrs, fragment.mSavedFragmentState);
addFragment(fragment, true);
} else if (fragment.mInLayout) {