| commit | 4c78e5c98e66258ddf975055336a96a2aefd9210 | [log] [tgz] |
|---|---|---|
| author | Evan Rosky <erosky@google.com> | Thu Aug 04 04:18:30 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 04 04:18:30 2022 +0000 |
| tree | e42975371001bf83ca9ffd46b53085503fa7f9cd | |
| parent | 6ac6ce936538af8c284b04b889f10a2256532e9e [diff] | |
| parent | 2e763d31d225dbc0b56e3bfb0e5d3b47a4dfb54d [diff] |
Merge "Revert "Strip transition information from activityoptions once it is read."" into sc-v2-dev am: 1099b25b2d am: d7ae033815 am: 2e763d31d2 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19517194 Change-Id: If8f1ab91e07e72b49859593c77471f54d399a367 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 61cca00..4fc3254 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java
@@ -1441,11 +1441,6 @@ } /** @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 1f3f039..7a7041d 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -4746,9 +4746,6 @@ 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() {