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

Merge "Only call -rerouted callback if displayId changed"

Browse Source
This commit is contained in:
Mark Renouf
2019-03-06 23:23:56 +00:00
committed by Android (Google) Code Review
parent 513299e2c3 2f9ea1ec49
commit f554792c8d
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/wm/ActivityStackSupervisor.java
View File

@@ -2430,17 +2430,17 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
final boolean singleTaskInstance = preferredDisplay != null
&& preferredDisplay.isSingleTaskInstance();
if (singleTaskInstance) {
if (preferredDisplayId != actualDisplayId) {
// Suppress the warning toast if the preferredDisplay was set to singleTask.
// The singleTaskInstance displays will only contain one task and any attempt to
// launch new task will re-route to the default display.
mService.getTaskChangeNotificationController()
.notifyActivityLaunchOnSecondaryDisplayRerouted(task.getTaskInfo(),
preferredDisplayId);
return;
}
if (singleTaskInstance) {
mService.getTaskChangeNotificationController()
.notifyActivityLaunchOnSecondaryDisplayRerouted(task.getTaskInfo(),
preferredDisplayId);
return;
}
if (preferredDisplayId != actualDisplayId) {
Slog.w(TAG, "Failed to put " + task + " on display " + preferredDisplayId);
// Display a warning toast that we failed to put a task on a secondary display.
mService.getTaskChangeNotificationController()