Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Iabc91498994f4712b7c76594eab7b2fd10251baa
This commit is contained in:
Winson Chung
2021-11-12 21:08:27 +00:00
committed by Automerger Merge Worker
parent 7ef1545a4c b5c5258a65
commit 969bf4f9c9
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -389,6 +389,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
} else { } else {
ActivityOptions mainActivityOptions = ActivityOptions.fromBundle(mainOptions); ActivityOptions mainActivityOptions = ActivityOptions.fromBundle(mainOptions);
mainActivityOptions.update(ActivityOptions.makeRemoteAnimation(wrappedAdapter)); mainActivityOptions.update(ActivityOptions.makeRemoteAnimation(wrappedAdapter));
mainOptions = mainActivityOptions.toBundle();
} }
sideOptions = sideOptions != null ? sideOptions : new Bundle(); sideOptions = sideOptions != null ? sideOptions : new Bundle();

4
services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
View File

@@ -19,6 +19,7 @@ package com.android.server.wm;
import static android.Manifest.permission.ACTIVITY_EMBEDDING; import static android.Manifest.permission.ACTIVITY_EMBEDDING;
import static android.Manifest.permission.CAMERA; import static android.Manifest.permission.CAMERA;
import static android.Manifest.permission.INTERNAL_SYSTEM_WINDOW; 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.Manifest.permission.START_ANY_ACTIVITY;
import static android.app.ActivityManager.LOCK_TASK_MODE_LOCKED; import static android.app.ActivityManager.LOCK_TASK_MODE_LOCKED;
import static android.app.ActivityManager.START_DELIVERED_TO_TOP; import static android.app.ActivityManager.START_DELIVERED_TO_TOP;
@@ -2506,7 +2507,8 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
activityType = activityOptions.getLaunchActivityType(); activityType = activityOptions.getLaunchActivityType();
final int windowingMode = activityOptions.getLaunchWindowingMode(); final int windowingMode = activityOptions.getLaunchWindowingMode();
if (activityOptions.freezeRecentTasksReordering() if (activityOptions.freezeRecentTasksReordering()
&& mRecentTasks.isCallerRecents(callingUid)) { && mService.checkPermission(MANAGE_ACTIVITY_TASKS, callingPid, callingUid)
== PERMISSION_GRANTED) {
mRecentTasks.setFreezeTaskListReordering(); mRecentTasks.setFreezeTaskListReordering();
} }
if (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY if (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY