diff options
| author | Evan Rosky <erosky@google.com> | 2022-08-04 04:58:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-04 04:58:41 +0000 |
| commit | 5a154b395a3f67fecfbffa9b85d2f760a49546f9 (patch) | |
| tree | 34021292fa593bdbd312c5e575a9438bcd95ba17 /core/java/android | |
| parent | d7ae033815ca79fe213eed937df13690785975ab (diff) | |
| parent | eeab60091ceef5bf89cef338c2f94ae74c46d377 (diff) | |
Merge "Strip transition information from activityoptions when sent to app" into sc-v2-dev am: eeab60091c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518999
Change-Id: I2996d813bc8a89c220e7c89efdd064d3c7ef3fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ActivityOptions.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index 2eebc01ccc04..0ba1614ab6c5 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -1442,6 +1442,11 @@ public class ActivityOptions extends ComponentOptions { } /** @hide */ + public void setRemoteTransition(@Nullable RemoteTransition remoteTransition) { + mRemoteTransition = remoteTransition; + } + + /** @hide */ public static ActivityOptions fromBundle(Bundle bOptions) { return bOptions != null ? new ActivityOptions(bOptions) : null; } |