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

Commit eeab6009 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Strip transition information from activityoptions when sent to app" into sc-v2-dev

parents 1099b25b 0d03e6f1

core/java/android/app/ActivityOptions.java

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

+4 −0
Original line number Diff line number Diff line
@@ -4640,8 +4640,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;

    }