aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYigit Boyar <yboyar@google.com>2017-09-12 20:35:19 -0700
committerYigit Boyar <yboyar@google.com>2017-09-21 00:39:18 +0000
commit740c9b3e91e6244bdf7e449ef3de137660957aa0 (patch)
tree927a9ce0365840294ba783467712810c2d51a7c7
parent2100a9051462fd3fb47ef5930e813ceeba954942 (diff)
downloadsupport-740c9b3e91e6244bdf7e449ef3de137660957aa0.tar.gz
Make getLifecycle public by overriding it in FragmentActivity
This CL fixes an issue where Studio thinks getLifecycle is a hidden method because it comes from SupportActivity. Bug: 65602468 Test: manual Change-Id: Icfa16b7e9dfe1b0445bda88e0d07540a28e92282
-rw-r--r--fragment/java/android/support/v4/app/FragmentActivity.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/fragment/java/android/support/v4/app/FragmentActivity.java b/fragment/java/android/support/v4/app/FragmentActivity.java
index 481f50d362d..e513ff7bf67 100644
--- a/fragment/java/android/support/v4/app/FragmentActivity.java
+++ b/fragment/java/android/support/v4/app/FragmentActivity.java
@@ -270,6 +270,16 @@ public class FragmentActivity extends BaseFragmentActivityApi16 implements
}
/**
+ * Returns the Lifecycle of the provider.
+ *
+ * @return The lifecycle of the provider.
+ */
+ @Override
+ public Lifecycle getLifecycle() {
+ return super.getLifecycle();
+ }
+
+ /**
* Perform initialization of all fragments and loaders.
*/
@SuppressWarnings("deprecation")