Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7ae0338 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Revert "Strip transition information from activityoptions once it is... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19517194



Change-Id: I0b8d234013f3551354f815533f2b4576b9100a48
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a824844c 1099b25b

core/java/android/app/ActivityOptions.java

+0 −5
Original line number Diff line number Diff line
@@ -1441,11 +1441,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;

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

+0 −3
Original line number Diff line number Diff line
@@ -4666,9 +4666,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() {