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

Commit c76e3b50 authored by Achim Thesmann's avatar Achim Thesmann Committed by Android (Google) Code Review
Browse files

Merge "Fix clone method for ActivityOptions"

parents 7cc5f438 0b2ee80a

core/java/android/app/ActivityOptions.java

+3 −1
Original line number Diff line number Diff line
@@ -1997,10 +1997,12 @@ public class ActivityOptions extends ComponentOptions { 


    /**

     * Sets background activity launch logic won't use pending intent creator foreground state.

     *

     * @hide

     */

    public void setIgnorePendingIntentCreatorForegroundState(boolean state) {

    public ActivityOptions setIgnorePendingIntentCreatorForegroundState(boolean state) {

        mIgnorePendingIntentCreatorForegroundState = state;

        return this;

    }



    /**

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

+5 −1
Original line number Diff line number Diff line
@@ -143,7 +143,11 @@ public class SafeActivityOptions { 
                .setLaunchTaskDisplayArea(options.getLaunchTaskDisplayArea())

                .setLaunchDisplayId(options.getLaunchDisplayId())

                .setCallerDisplayId(options.getCallerDisplayId())

                .setLaunchRootTask(options.getLaunchRootTask());

                .setLaunchRootTask(options.getLaunchRootTask())

                .setPendingIntentBackgroundActivityStartMode(

                        options.getPendingIntentBackgroundActivityStartMode())

                .setIgnorePendingIntentCreatorForegroundState(

                        options.getIgnorePendingIntentCreatorForegroundState());

    }



    /**