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

Commit 0d32b933 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Launch all activities into the same windowingMode" into main am: d67cb978 

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



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

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;

    }



    /**