diff options
| author | Todd Kennedy <toddke@google.com> | 2015-08-31 22:45:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-31 22:45:23 +0000 |
| commit | 9e25e1645f5e436c88ceab7d7eaf9f21c7fa845b (patch) | |
| tree | f69fc1642aa3ae4fd78bf8bb629f7bf47a078e71 /core | |
| parent | d66d4d1bea063acefae6bab5faf822d7a363b216 (diff) | |
| parent | e7078e181cd00d20ce7764efa9835e2604a3cb83 (diff) | |
| download | frameworks_base-9e25e1645f5e436c88ceab7d7eaf9f21c7fa845b.zip frameworks_base-9e25e1645f5e436c88ceab7d7eaf9f21c7fa845b.tar.gz frameworks_base-9e25e1645f5e436c88ceab7d7eaf9f21c7fa845b.tar.bz2 | |
am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev
* commit 'e7078e181cd00d20ce7764efa9835e2604a3cb83':
Ensure host is set before onInflate()
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/FragmentManager.java | 1 |
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) { |