commit 33ca87b792259929b371b39c7a6b8dd758fa67d6
author Chris Banes <chrisbanes@google.com> Tue Sep 01 18:36:28 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 01 18:36:28 2015 +0000
tree 0777f26edddf9004be81b36b4236468975b0fcf9
parent 1b84066e4233b4b0c8a32fffc30f95b8cd20ced4
parent 6accd7604de23846c19d1f6d7f6e3e2ab77162e1

Merge "Fix NPE in onTouchEvent again" into mnc-dev

v4/java/android/support/v4/app/FragmentManager.java

diff --git a/v4/java/android/support/v4/app/FragmentManager.java b/v4/java/android/support/v4/app/FragmentManager.java
index 4950537..ab2c21e 100644
--- a/v4/java/android/support/v4/app/FragmentManager.java
+++ b/v4/java/android/support/v4/app/FragmentManager.java
@@ -2238,6 +2238,7 @@
             fragment.mTag = tag;
             fragment.mInLayout = true;
             fragment.mFragmentManager = this;
+            fragment.mHost = mHost;
             fragment.onInflate(mHost.getContext(), attrs, fragment.mSavedFragmentState);
             addFragment(fragment, true);