Merge "Fix setting null target fragments"

2017-02-01 20:54:49 +00:00
parent a03a291437 0621742d3c
commit edae71777f
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/app/Fragment.java
+++ b/core/java/android/app/Fragment.java
@@ -788,7 +788,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");