Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fragment#setUserVisibleHint guard" into nyc-dev

Browse Source 
am: c0eb067

* commit 'c0eb067ceb25f1c6585d18874f75afd151826e2b':
  Fragment#setUserVisibleHint guard

Change-Id: If30524bf81f10649fd0d8a3b652523f1d0a62e1a
This commit is contained in:
Adam Powell
2016-04-06 17:34:34 +00:00
committed by android-build-merger
parent 52eddf8394 c0eb067ceb
commit 237ce73ed9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/Fragment.java
View File

@@ -1033,7 +1033,8 @@ 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 && isAdded()) { if (!mUserVisibleHint && isVisibleToUser && mState < STARTED
&& mFragmentManager != null && isAdded()) {
mFragmentManager.performPendingDeferredStart(this); mFragmentManager.performPendingDeferredStart(this);
} }
mUserVisibleHint = isVisibleToUser; mUserVisibleHint = isVisibleToUser;