diff options
| author | 2022-08-03 01:24:31 +0000 | |
|---|---|---|
| committer | 2022-08-03 01:24:31 +0000 | |
| commit | 0bd65b828db256f450cdefc88f08588391831df0 (patch) | |
| tree | 7a689aa4b8076cb301af95286b8a19386e984eb2 | |
| parent | 56188023e706b16240f36a50b82c3d86c26bc5c4 (diff) | |
| parent | fc301ed47c1f29cddfcefbcaf95bbc92ba2f1216 (diff) | |
Merge "Strip transition information from activityoptions once it is read." into sc-v2-dev am: dc8ae7665a am: a824844cdf am: 7cb144249f am: fc301ed47c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19505172
Change-Id: If01ba8a3c9d4146e3e4c62c239c374e0dd931b71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/app/ActivityOptions.java | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index 3f769a161a8c..e3ea1238181f 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -1453,6 +1453,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; } diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 7a7041d5baa0..1f3f039a83fa 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -4746,6 +4746,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A mPendingRemoteAnimation = options.getRemoteAnimationAdapter(); } mPendingRemoteTransition = options.getRemoteTransition(); + // Since options gets sent to client apps, remove transition information from it. + options.setRemoteTransition(null); + options.setRemoteAnimationAdapter(null); } void applyOptionsAnimation() { |