summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorTodd Kennedy <toddke@google.com>2015-10-19 22:52:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-10-19 22:52:27 +0000
commit986d4b482da952cd07e329b3bd11c935edd7ec01 (patch)
tree63d70aca18e3a8aade03866305b9d545d2f84e12 /core
parent7f2deeeef53887dcad74b8aed86936983353cec4 (diff)
parentac0e6ca0d20446d34d9855b898611e6960866853 (diff)
downloadframeworks_base-986d4b482da952cd07e329b3bd11c935edd7ec01.zip
frameworks_base-986d4b482da952cd07e329b3bd11c935edd7ec01.tar.gz
frameworks_base-986d4b482da952cd07e329b3bd11c935edd7ec01.tar.bz2
Merge "Set host when restoring a fragment" into mnc-dr-dev
Diffstat (limited to 'core')
-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 51d6132..046c87a 100644
--- a/core/java/android/app/FragmentManager.java
+++ b/core/java/android/app/FragmentManager.java
@@ -2221,6 +2221,7 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
// This fragment was retained from a previous instance; get it
// going now.
fragment.mInLayout = true;
+ fragment.mHost = mHost;
// If this fragment is newly instantiated (either right now, or
// from last saved state), then give it the attributes to
// initialize itself.