Merge "Revert "Strip transition information from activityoptions once it is read."" into sc-v2-dev

core/java/android/app/ActivityOptions.java

@@ -1352,11 +1352,6 @@ public class ActivityOptions {
         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;

services/core/java/com/android/server/wm/ActivityRecord.java

@@ -4426,9 +4426,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() {