Merge "Fix NPE for Fragment#setUserVisibleHint(true)" into nyc-dev

am: 35c8e0fcf2

* commit '35c8e0fcf2e26f24ac21bb3df87158d4a0f4587f':
  Fix NPE for Fragment#setUserVisibleHint(true)
This commit is contained in:
Adam Powell
2016-02-18 23:53:06 +00:00
committed by android-build-merger

View File

@@ -1033,7 +1033,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
* false if it is not. * false if it is not.
*/ */
public void setUserVisibleHint(boolean isVisibleToUser) { public void setUserVisibleHint(boolean isVisibleToUser) {
if (!mUserVisibleHint && isVisibleToUser && mState < STARTED) { if (!mUserVisibleHint && isVisibleToUser && mState < STARTED && mFragmentManager != null) {
mFragmentManager.performPendingDeferredStart(this); mFragmentManager.performPendingDeferredStart(this);
} }
mUserVisibleHint = isVisibleToUser; mUserVisibleHint = isVisibleToUser;