diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-01-24 23:58:13 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-01-25 11:28:39 -0800 |
| commit | 7187ccb93ee8adbb745fcbb901cfacfeed397a23 (patch) | |
| tree | cc1a17e2e05e8b4898a3ff9f2f5978275d272412 /core/java/android/app/FragmentManager.java | |
| parent | 774f9be5dc02e8a7f742008872c6214e517cb8a3 (diff) | |
Fix issue #3385839: Fragment.onCreateView is passing in activity...
...context for a DialogFragment
Change-Id: I434ebca64d2738da4c27321db8dbbded2cbe167d
Diffstat (limited to 'core/java/android/app/FragmentManager.java')
| -rw-r--r-- | core/java/android/app/FragmentManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java index 2c9c85b11df9..52b310840276 100644 --- a/core/java/android/app/FragmentManager.java +++ b/core/java/android/app/FragmentManager.java @@ -705,7 +705,7 @@ final class FragmentManagerImpl extends FragmentManager { // For fragments that are part of the content view // layout, we need to instantiate the view immediately // and the inflater will take care of adding it. - f.mView = f.onCreateView(mActivity.getLayoutInflater(), + f.mView = f.onCreateView(f.getLayoutInflater(f.mSavedFragmentState), null, f.mSavedFragmentState); if (f.mView != null) { f.mView.setSaveFromParentEnabled(false); @@ -727,7 +727,7 @@ final class FragmentManagerImpl extends FragmentManager { } } f.mContainer = container; - f.mView = f.onCreateView(mActivity.getLayoutInflater(), + f.mView = f.onCreateView(f.getLayoutInflater(f.mSavedFragmentState), container, f.mSavedFragmentState); if (f.mView != null) { f.mView.setSaveFromParentEnabled(false); |