Only start RequestManagers, not lifecycles when creating with visible…

… parents

library/src/main/java/com/bumptech/glide/manager/RequestManagerRetriever.java

@@ -357,25 +357,19 @@ public RequestManager get(@NonNull android.app.Fragment fragment) {
   @Deprecated
   @NonNull
   RequestManagerFragment getRequestManagerFragment(Activity activity) {
-    return getRequestManagerFragment(
-        activity.getFragmentManager(), /*parentHint=*/ null, isActivityVisible(activity));
+    return getRequestManagerFragment(activity.getFragmentManager(), /*parentHint=*/ null);
   }
 
   @SuppressWarnings("deprecation")
   @NonNull
   private RequestManagerFragment getRequestManagerFragment(
-      @NonNull final android.app.FragmentManager fm,
-      @Nullable android.app.Fragment parentHint,
-      boolean isParentVisible) {
+      @NonNull final android.app.FragmentManager fm, @Nullable android.app.Fragment parentHint) {
     RequestManagerFragment current = (RequestManagerFragment) fm.findFragmentByTag(FRAGMENT_TAG);
     if (current == null) {
       current = pendingRequestManagerFragments.get(fm);
       if (current == null) {
         current = new RequestManagerFragment();
         current.setParentFragmentHint(parentHint);
-        if (isParentVisible) {
-          current.getGlideLifecycle().onStart();
-        }
         pendingRequestManagerFragments.put(fm, current);
         fm.beginTransaction().add(current, FRAGMENT_TAG).commitAllowingStateLoss();
         handler.obtainMessage(ID_REMOVE_FRAGMENT_MANAGER, fm).sendToTarget();
@@ -392,24 +386,28 @@ private RequestManager fragmentGet(
       @NonNull android.app.FragmentManager fm,
       @Nullable android.app.Fragment parentHint,
       boolean isParentVisible) {
-    RequestManagerFragment current = getRequestManagerFragment(fm, parentHint, isParentVisible);
+    RequestManagerFragment current = getRequestManagerFragment(fm, parentHint);
     RequestManager requestManager = current.getRequestManager();
     if (requestManager == null) {
       // TODO(b/27524013): Factor out this Glide.get() call.
       Glide glide = Glide.get(context);
       requestManager =
           factory.build(
               glide, current.getGlideLifecycle(), current.getRequestManagerTreeNode(), context);
+      // This is a bit of hack, we're going to start the RequestManager, but not the
+      // corresponding Lifecycle. It's safe to start the RequestManager, but starting the
+      // Lifecycle might trigger memory leaks. See b/154405040
+      if (isParentVisible) {
+        requestManager.onStart();
+      }
       current.setRequestManager(requestManager);
     }
     return requestManager;
   }
 
   @NonNull
-  SupportRequestManagerFragment getSupportRequestManagerFragment(
-      Context context, FragmentManager fragmentManager) {
-    return getSupportRequestManagerFragment(
-        fragmentManager, /*parentHint=*/ null, isActivityVisible(context));
+  SupportRequestManagerFragment getSupportRequestManagerFragment(FragmentManager fragmentManager) {
+    return getSupportRequestManagerFragment(fragmentManager, /*parentHint=*/ null);
   }
 
   private static boolean isActivityVisible(Context context) {
@@ -421,17 +419,14 @@ private static boolean isActivityVisible(Context context) {
 
   @NonNull
   private SupportRequestManagerFragment getSupportRequestManagerFragment(
-      @NonNull final FragmentManager fm, @Nullable Fragment parentHint, boolean isParentVisible) {
+      @NonNull final FragmentManager fm, @Nullable Fragment parentHint) {
     SupportRequestManagerFragment current =
         (SupportRequestManagerFragment) fm.findFragmentByTag(FRAGMENT_TAG);
     if (current == null) {
       current = pendingSupportRequestManagerFragments.get(fm);
       if (current == null) {
         current = new SupportRequestManagerFragment();
         current.setParentFragmentHint(parentHint);
-        if (isParentVisible) {
-          current.getGlideLifecycle().onStart();
-        }
         pendingSupportRequestManagerFragments.put(fm, current);
         fm.beginTransaction().add(current, FRAGMENT_TAG).commitAllowingStateLoss();
         handler.obtainMessage(ID_REMOVE_SUPPORT_FRAGMENT_MANAGER, fm).sendToTarget();
@@ -446,15 +441,20 @@ private RequestManager supportFragmentGet(
       @NonNull FragmentManager fm,
       @Nullable Fragment parentHint,
       boolean isParentVisible) {
-    SupportRequestManagerFragment current =
-        getSupportRequestManagerFragment(fm, parentHint, isParentVisible);
+    SupportRequestManagerFragment current = getSupportRequestManagerFragment(fm, parentHint);
     RequestManager requestManager = current.getRequestManager();
     if (requestManager == null) {
       // TODO(b/27524013): Factor out this Glide.get() call.
       Glide glide = Glide.get(context);
       requestManager =
           factory.build(
               glide, current.getGlideLifecycle(), current.getRequestManagerTreeNode(), context);
+      // This is a bit of hack, we're going to start the RequestManager, but not the
+      // corresponding Lifecycle. It's safe to start the RequestManager, but starting the
+      // Lifecycle might trigger memory leaks. See b/154405040
+      if (isParentVisible) {
+        requestManager.onStart();
+      }
       current.setRequestManager(requestManager);
     }
     return requestManager;

library/src/main/java/com/bumptech/glide/manager/SupportRequestManagerFragment.java

@@ -154,7 +154,7 @@ private void registerFragmentWithRoot(
     rootRequestManagerFragment =
         Glide.get(context)
             .getRequestManagerRetriever()
-            .getSupportRequestManagerFragment(context, fragmentManager);
+            .getSupportRequestManagerFragment(fragmentManager);
     if (!equals(rootRequestManagerFragment)) {
       rootRequestManagerFragment.addChildRequestManagerFragment(this);
     }