Merge "Fragment#setUserVisibleHint guard" into nyc-dev

2016-04-06 17:26:52 +00:00
parent 52c30b0cf8 3e10ae927c
commit c0eb067ceb
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/app/Fragment.java
+++ b/core/java/android/app/Fragment.java
@@ -1033,7 +1033,8 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
     *                        false if it is not.
     */
    public void setUserVisibleHint(boolean isVisibleToUser) {
-        if (!mUserVisibleHint && isVisibleToUser && mState < STARTED && isAdded()) {
+        if (!mUserVisibleHint && isVisibleToUser && mState < STARTED
+                && mFragmentManager != null && isAdded()) {
            mFragmentManager.performPendingDeferredStart(this);
        }
        mUserVisibleHint = isVisibleToUser;