Merge "Don't performPendingDeferredStart on fragments that aren't added" into nyc-dev

2016-04-02 01:08:59 +00:00
parent e731fab348 b963c99c3a
commit 7af7e3d18e
1 changed files with 2 additions and 2 deletions
--- a/core/java/android/app/Fragment.java
+++ b/core/java/android/app/Fragment.java
@@ -1033,11 +1033,11 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
     *                        false if it is not.
     */
    public void setUserVisibleHint(boolean isVisibleToUser) {
-        if (!mUserVisibleHint && isVisibleToUser && mState < STARTED && mFragmentManager != null) {
+        if (!mUserVisibleHint && isVisibleToUser && mState < STARTED && isAdded()) {
            mFragmentManager.performPendingDeferredStart(this);
        }
        mUserVisibleHint = isVisibleToUser;
-        mDeferStart = !isVisibleToUser;
+        mDeferStart = mState < STARTED && !isVisibleToUser;
    }

    /**