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

Merge "Fix bug with drag-to-split involving work profiles" into udc-dev

Browse Source
This commit is contained in:
Jeremy Sim
2023-05-22 21:33:14 +00:00
committed by Android (Google) Code Review
parent 385d2a0f7b beafcf1562
commit 57d6975cfb
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java
View File

@@ -371,7 +371,8 @@ public class RecentTasksController implements TaskStackListenerCallback,
* Find the background task that match the given component. * Find the background task that match the given component.
*/ */
@Nullable @Nullable
public ActivityManager.RecentTaskInfo findTaskInBackground(ComponentName componentName) { public ActivityManager.RecentTaskInfo findTaskInBackground(ComponentName componentName,
int userId) {
if (componentName == null) { if (componentName == null) {
return null; return null;
} }
@@ -383,7 +384,7 @@ public class RecentTasksController implements TaskStackListenerCallback,
if (task.isVisible) { if (task.isVisible) {
continue; continue;
} }
if (componentName.equals(task.baseIntent.getComponent())) { if (componentName.equals(task.baseIntent.getComponent()) && userId == task.userId) {
return task; return task;
} }
} }

2
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java
View File

@@ -723,7 +723,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
// in the background with priority. // in the background with priority.
final ActivityManager.RecentTaskInfo taskInfo = mRecentTasksOptional final ActivityManager.RecentTaskInfo taskInfo = mRecentTasksOptional
.map(recentTasks -> recentTasks.findTaskInBackground( .map(recentTasks -> recentTasks.findTaskInBackground(
intent.getIntent().getComponent())) intent.getIntent().getComponent(), userId1))
.orElse(null); .orElse(null);
if (taskInfo != null) { if (taskInfo != null) {
startTask(taskInfo.taskId, position, options); startTask(taskInfo.taskId, position, options);

4
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitScreenControllerTests.java
View File

@@ -223,7 +223,7 @@ public class SplitScreenControllerTests extends ShellTestCase {
doReturn(topRunningTask).when(mRecentTasks).getTopRunningTask(); doReturn(topRunningTask).when(mRecentTasks).getTopRunningTask();
// Put the same component into a task in the background // Put the same component into a task in the background
ActivityManager.RecentTaskInfo sameTaskInfo = new ActivityManager.RecentTaskInfo(); ActivityManager.RecentTaskInfo sameTaskInfo = new ActivityManager.RecentTaskInfo();
doReturn(sameTaskInfo).when(mRecentTasks).findTaskInBackground(any()); doReturn(sameTaskInfo).when(mRecentTasks).findTaskInBackground(any(), anyInt());
mSplitScreenController.startIntent(pendingIntent, mContext.getUserId(), null, mSplitScreenController.startIntent(pendingIntent, mContext.getUserId(), null,
SPLIT_POSITION_TOP_OR_LEFT, null); SPLIT_POSITION_TOP_OR_LEFT, null);
@@ -247,7 +247,7 @@ public class SplitScreenControllerTests extends ShellTestCase {
SPLIT_POSITION_BOTTOM_OR_RIGHT); SPLIT_POSITION_BOTTOM_OR_RIGHT);
// Put the same component into a task in the background // Put the same component into a task in the background
doReturn(new ActivityManager.RecentTaskInfo()).when(mRecentTasks) doReturn(new ActivityManager.RecentTaskInfo()).when(mRecentTasks)
.findTaskInBackground(any()); .findTaskInBackground(any(), anyInt());
mSplitScreenController.startIntent(pendingIntent, mContext.getUserId(), null, mSplitScreenController.startIntent(pendingIntent, mContext.getUserId(), null,
SPLIT_POSITION_TOP_OR_LEFT, null); SPLIT_POSITION_TOP_OR_LEFT, null);