From 0621742d3c9e691e4615da924db69333e371f3f7 Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Wed, 1 Feb 2017 10:45:12 -0800 Subject: [PATCH] Fix setting null target fragments Bug 34869013 Test: CTS Change-Id: Ibeed66f9a889a8e395bfabedcf22aebcbb848908 --- core/java/android/app/Fragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java index 612998dd5158..a0f2cb50dcf3 100644 --- a/core/java/android/app/Fragment.java +++ b/core/java/android/app/Fragment.java @@ -767,7 +767,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene // We'll have the FragmentManager check that for validity when we move // the fragments to a valid state. final FragmentManager mine = getFragmentManager(); - final FragmentManager theirs = fragment.getFragmentManager(); + final FragmentManager theirs = fragment != null ? fragment.getFragmentManager() : null; if (mine != null && theirs != null && mine != theirs) { throw new IllegalArgumentException("Fragment " + fragment + " must share the same FragmentManager to be set as a target fragment"); -- 2.11.0