diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index 61cca00f76ac1..4fc3254ed1a3a 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -1440,11 +1440,6 @@ public class ActivityOptions extends ComponentOptions { return mRemoteTransition; } - /** @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 1f3f039a83fac..7a7041d5baa06 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 @@ 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() {