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

Commit 90669492 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

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



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

core/java/android/app/ActivityOptions.java

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