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

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

Merge "Strip transition information from activityoptions when sent to app"... 

Merge "Strip transition information from activityoptions when sent to app" into sc-v2-dev am: eeab6009 am: 5a154b39

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



Change-Id: Id85f7d2eeaf467cc5c77213379fff81b57c4a67f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e763d31 5a154b39

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

+4 −0
Original line number Diff line number Diff line
@@ -4884,8 +4884,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
    ActivityOptions takeOptions() {

        if (DEBUG_TRANSITION) Slog.i(TAG, "Taking options for " + this + " callers="

                + Debug.getCallers(6));

        if (mPendingOptions == null) return null;

        final ActivityOptions opts = mPendingOptions;

        mPendingOptions = null;

        // Strip sensitive information from options before sending it to app.

        opts.setRemoteTransition(null);

        opts.setRemoteAnimationAdapter(null);

        return opts;

    }