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

Commit 406b4940 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Fix issue with provided options not being applied when launching split... 

Merge "Fix issue with provided options not being applied when launching split tasks" into sc-v2-dev am: b5c5258a am: 969bf4f9

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

Change-Id: I98da00a4edeb403a77acdba359f015ac97a8e07c
parents d30f8f52 969bf4f9

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+1 −0
Original line number Diff line number Diff line
@@ -389,6 +389,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        } else {

            ActivityOptions mainActivityOptions = ActivityOptions.fromBundle(mainOptions);

            mainActivityOptions.update(ActivityOptions.makeRemoteAnimation(wrappedAdapter));

            mainOptions = mainActivityOptions.toBundle();

        }



        sideOptions = sideOptions != null ? sideOptions : new Bundle();

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

+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.wm; 
import static android.Manifest.permission.ACTIVITY_EMBEDDING;

import static android.Manifest.permission.CAMERA;

import static android.Manifest.permission.INTERNAL_SYSTEM_WINDOW;

import static android.Manifest.permission.MANAGE_ACTIVITY_TASKS;

import static android.Manifest.permission.START_ANY_ACTIVITY;

import static android.app.ActivityManager.LOCK_TASK_MODE_LOCKED;

import static android.app.ActivityManager.START_DELIVERED_TO_TOP;
@@ -2494,7 +2495,8 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
                activityType = activityOptions.getLaunchActivityType();

                final int windowingMode = activityOptions.getLaunchWindowingMode();

                if (activityOptions.freezeRecentTasksReordering()

                        && mRecentTasks.isCallerRecents(callingUid)) {

                        && mService.checkPermission(MANAGE_ACTIVITY_TASKS, callingPid, callingUid)

                                == PERMISSION_GRANTED) {

                    mRecentTasks.setFreezeTaskListReordering();

                }

                if (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY