| commit | fc301ed47c1f29cddfcefbcaf95bbc92ba2f1216 | [log] [tgz] |
|---|---|---|
| author | Evan Rosky <erosky@google.com> | Wed Aug 03 01:09:46 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 03 01:09:46 2022 +0000 |
| tree | 79e4776a9607c86800586aa8ce3be25e52c03dd7 | |
| parent | 34c2839d3cf13e57071032828271af888ba0ac08 [diff] | |
| parent | 7cb144249f8d9284a3766c49e573fb0d52798abf [diff] |
Merge "Strip transition information from activityoptions once it is read." into sc-v2-dev am: dc8ae7665a am: a824844cdf am: 7cb144249f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19505172 Change-Id: Ibded759578f05fe3dab6af5f0dc0e8579756e46d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index 4fc3254..61cca00 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java
@@ -1441,6 +1441,11 @@ } /** @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 7a7041d..1f3f039 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 @@ 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() {