commit bb5ad30aaff77d3e7226133b98c434e9f9cc1a45
author android-build-team Robot <android-build-team-robot@google.com> Wed Jun 28 07:30:25 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jun 28 07:30:25 2017 +0000
tree dd3e67b690fbfa2866281214332a4efdc8061a70
parent 31e64acd1e65045471124267a06241eff1f55d26
parent ef6d5767ed0a888ac27e29a28684f0e1bcb9708a

release-request-1b0d6769-ebfa-4e2d-b128-039ac0dcd5c9-for-git_oc-mr1-release-4140700 snap-temp-L81200000078275553

Change-Id: Ief3797c9cadb094ff031519be569f6544460cf62

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

diff --git a/library/src/main/java/com/bumptech/glide/manager/RequestManagerFragment.java b/library/src/main/java/com/bumptech/glide/manager/RequestManagerFragment.java
index 47d93af..41dee4b 100644
--- a/library/src/main/java/com/bumptech/glide/manager/RequestManagerFragment.java
+++ b/library/src/main/java/com/bumptech/glide/manager/RequestManagerFragment.java
@@ -40,7 +40,7 @@
         this.requestManager = requestManager;
     }
 
-    ActivityFragmentLifecycle getLifecycle() {
+    ActivityFragmentLifecycle getGlideLifecycle() {
         return lifecycle;
     }
 

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

diff --git a/library/src/main/java/com/bumptech/glide/manager/RequestManagerRetriever.java b/library/src/main/java/com/bumptech/glide/manager/RequestManagerRetriever.java
index b0b80fa..4e98c5f 100644
--- a/library/src/main/java/com/bumptech/glide/manager/RequestManagerRetriever.java
+++ b/library/src/main/java/com/bumptech/glide/manager/RequestManagerRetriever.java
@@ -172,7 +172,7 @@
         }
         RequestManager requestManager = current.getRequestManager();
         if (requestManager == null) {
-            requestManager = new RequestManager(context, current.getLifecycle());
+            requestManager = new RequestManager(context, current.getGlideLifecycle());
             current.setRequestManager(requestManager);
         }
         return requestManager;
@@ -192,7 +192,7 @@
         }
         RequestManager requestManager = current.getRequestManager();
         if (requestManager == null) {
-            requestManager = new RequestManager(context, current.getLifecycle());
+            requestManager = new RequestManager(context, current.getGlideLifecycle());
             current.setRequestManager(requestManager);
         }
         return requestManager;

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

diff --git a/library/src/main/java/com/bumptech/glide/manager/SupportRequestManagerFragment.java b/library/src/main/java/com/bumptech/glide/manager/SupportRequestManagerFragment.java
index b5e73b6..64846c0 100644
--- a/library/src/main/java/com/bumptech/glide/manager/SupportRequestManagerFragment.java
+++ b/library/src/main/java/com/bumptech/glide/manager/SupportRequestManagerFragment.java
@@ -37,7 +37,7 @@
         this.requestManager = requestManager;
     }
 
-    ActivityFragmentLifecycle getLifecycle() {
+    ActivityFragmentLifecycle getGlideLifecycle() {
         return lifecycle;
     }