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

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

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

Merge "Strip transition information from activityoptions once it is read." into sc-v2-dev am: dc8ae766 am: a824844c am: 90669492

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



Change-Id: Ie65a150c24a11b286d4d5f8022daba52dc055b96
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ec164671 90669492

core/java/android/app/ActivityOptions.java

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

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