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

Commit d67cb978 authored by Louis Chang's avatar Louis Chang Committed by Gerrit Code Review
Browse files

Merge "Launch all activities into the same windowingMode" into main

parents df34b537 27ce0cd4

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

+5 −1
Original line number Diff line number Diff line
@@ -140,7 +140,9 @@ public class SafeActivityOptions { 
    }



    private ActivityOptions cloneLaunchingOptions(ActivityOptions options) {

        return options == null ? null : ActivityOptions.makeBasic()

        if (options == null) return null;



        final ActivityOptions cloneOptions = ActivityOptions.makeBasic()

                .setLaunchTaskDisplayArea(options.getLaunchTaskDisplayArea())

                .setLaunchDisplayId(options.getLaunchDisplayId())

                .setCallerDisplayId(options.getCallerDisplayId())
@@ -150,6 +152,8 @@ public class SafeActivityOptions { 
                .setPendingIntentCreatorBackgroundActivityStartMode(

                        options.getPendingIntentCreatorBackgroundActivityStartMode())

                .setRemoteTransition(options.getRemoteTransition());

        cloneOptions.setLaunchWindowingMode(options.getLaunchWindowingMode());

        return cloneOptions;

    }



    /**