summaryrefslogtreecommitdiff
path: root/core/java/android/app/Activity.java
diff options
context:
space:
mode:
Diffstat (limited to 'core/java/android/app/Activity.java')
-rw-r--r--core/java/android/app/Activity.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 228d82ef958c..28498ec7eeaa 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -5284,6 +5284,14 @@ public class Activity extends ContextThemeWrapper
}
}
+ /** @hide */
+ public void onNewActivityOptions(ActivityOptions options) {
+ mActivityTransitionState.setEnterActivityOptions(this, options);
+ if (!mStopped) {
+ mActivityTransitionState.enterReady(this);
+ }
+ }
+
/**
* Retrieve the ActivityOptions passed in from the launching activity or passed back
* from an activity launched by this activity in its call to {@link