7/n Use display area instead of display id in ATM methods
Bug: 152116619
Test: WM CTS and unit tests
Change-Id: I2267fdb7fc0e6e87ab8c3e9794de37947f2a70e7
diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java
index fee1c80..b91f709 100644
--- a/services/core/java/com/android/server/wm/TaskDisplayArea.java
+++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java
@@ -70,7 +70,9 @@
* {@link DisplayArea} that represents a section of a screen that contains app window containers.
*/
final class TaskDisplayArea extends DisplayArea<ActivityStack> {
+
DisplayContent mDisplayContent;
+
/**
* A control placed at the appropriate level for transitions to occur.
*/
@@ -1068,7 +1070,7 @@
/**
* Find task for putting the Activity in.
*/
- void findTaskLocked(final ActivityRecord r, final boolean isPreferredDisplay,
+ void findTaskLocked(final ActivityRecord r, final boolean isPreferredDisplayArea,
RootWindowContainer.FindTaskResult result) {
mTmpFindTaskResult.clear();
for (int stackNdx = getStackCount() - 1; stackNdx >= 0; --stackNdx) {
@@ -1090,7 +1092,7 @@
if (mTmpFindTaskResult.mIdealMatch) {
result.setTo(mTmpFindTaskResult);
return;
- } else if (isPreferredDisplay) {
+ } else if (isPreferredDisplayArea) {
// Note: since the traversing through the stacks is top down, the floating
// tasks should always have lower priority than any affinity-matching tasks
// in the fullscreen stacks