From 3e10ae927cc4f655f4331264bd24da6b97d5ac1e Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Wed, 6 Apr 2016 09:57:40 -0700
Subject: [PATCH] Fragment#setUserVisibleHint guard

Bug 28026606

Change-Id: I109bce6ecd35feaa045b61a7226b2a19344d2cda
---
 core/java/android/app/Fragment.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java
index c745644adf134..2a04c39f2c5a6 100644
--- 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;