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

Merge "Fix returning activity that not in the task" into rvc-dev

Browse Source
This commit is contained in:
Louis Chang
2020-05-25 04:53:39 +00:00
committed by Android (Google) Code Review
parent ebbd9e4b6f 523e3e8cd6
commit 3799331c9f
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/Task.java
View File

@@ -3766,11 +3766,7 @@ class Task extends WindowContainer<WindowContainer> {
if (r == null) {
return null;
}
final Task task = r.getRootTask();
if (task != null && r.isDescendantOf(task)) {
if (task != this) Slog.w(TAG, "Illegal state! task does not point to stack it is in. "
+ "stack=" + this + " task=" + task + " r=" + r
+ " callers=" + Debug.getCallers(15, "\n"));
if (r.isDescendantOf(this)) {
return r;
}
return null;

12
services/tests/wmtests/src/com/android/server/wm/TaskTests.java
View File

@@ -146,4 +146,16 @@ public class TaskTests extends WindowTestsBase {
task.setBounds(bounds);
assertEquals(new Point(bounds.left, bounds.top), task.getLastSurfacePosition());
}
@Test
public void testIsInStack() {
final Task task1 = createTaskStackOnDisplay(mDisplayContent);
final Task task2 = createTaskStackOnDisplay(mDisplayContent);
final ActivityRecord activity1 =
WindowTestUtils.createActivityRecordInTask(mDisplayContent, task1);
final ActivityRecord activity2 =
WindowTestUtils.createActivityRecordInTask(mDisplayContent, task2);
assertEquals(activity1, task1.isInTask(activity1));
assertNull(task1.isInTask(activity2));
}
}