summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorWei Sheng Shih <wilsonshih@google.com>2022-02-10 07:18:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-02-10 07:18:22 +0000
commit761e58ee17b28f474ca5cdc7e8edb88baf997aa1 (patch)
tree213b5149c3704e2fe8ea0c8417138d4365c0c292 /core/java
parentfc1567fbd614d4f0861467c4e86c46bc584c228f (diff)
parent64d96eba959a3838883982ec69f2b160648a1077 (diff)
Merge "Make getSplashScreenStyle public."
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/ActivityOptions.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java
index e405b60c8daa..acbcb3ea89b5 100644
--- a/core/java/android/app/ActivityOptions.java
+++ b/core/java/android/app/ActivityOptions.java
@@ -1429,7 +1429,6 @@ public class ActivityOptions extends ComponentOptions {
/**
* Gets the style can be used for cold-launching an activity.
* @see #setSplashScreenStyle(int)
- * @hide
*/
public @SplashScreen.SplashScreenStyle int getSplashScreenStyle() {
return mSplashScreenStyle;