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

Merge "Use the real activity component to find reusable task" into qt-dev

Browse Source 
am: f0cea00104

Change-Id: Ic454dd700b849c394a78b268804eb358d3dc4197
This commit is contained in:
Sanry Huang
2019-06-28 07:29:06 -07:00
committed by android-build-merger
parent e6e57b2c8f f0cea00104
commit c58a2d795f
2 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/ActivityStack.java
View File

@@ -1387,13 +1387,12 @@ class ActivityStack extends ConfigurationContainer {
}
if (DEBUG_TASKS) Slog.d(TAG_TASKS, "Comparing existing cls="
+ taskIntent.getComponent().flattenToShortString()
+ (task.realActivity != null ? task.realActivity.flattenToShortString() : "")
+ "/aff=" + r.getTaskRecord().rootAffinity + " to new cls="
+ intent.getComponent().flattenToShortString() + "/aff=" + info.taskAffinity);
// TODO Refactor to remove duplications. Check if logic can be simplified.
if (taskIntent != null && taskIntent.getComponent() != null &&
taskIntent.getComponent().compareTo(cls) == 0 &&
Objects.equals(documentData, taskDocumentData)) {
if (task.realActivity != null && task.realActivity.compareTo(cls) == 0
&& Objects.equals(documentData, taskDocumentData)) {
if (DEBUG_TASKS) Slog.d(TAG_TASKS, "Found matching class!");
//dump();
if (DEBUG_TASKS) Slog.d(TAG_TASKS,

29
services/tests/wmtests/src/com/android/server/wm/ActivityStackTests.java
View File

@@ -261,6 +261,35 @@ public class ActivityStackTests extends ActivityTestsBase {
assertNotNull(result.mRecord);
}
@Test
public void testFindTaskAlias() {
final String targetActivity = "target.activity";
final String aliasActivity = "alias.activity";
final ComponentName target = new ComponentName(DEFAULT_COMPONENT_PACKAGE_NAME,
targetActivity);
final ComponentName alias = new ComponentName(DEFAULT_COMPONENT_PACKAGE_NAME,
aliasActivity);
final TaskRecord task = new TaskBuilder(mService.mStackSupervisor).setStack(mStack).build();
task.origActivity = alias;
task.realActivity = target;
new ActivityBuilder(mService).setComponent(target).setTask(task).setTargetActivity(
targetActivity).build();
// Using target activity to find task.
final ActivityRecord r1 = new ActivityBuilder(mService).setComponent(
target).setTargetActivity(targetActivity).build();
RootActivityContainer.FindTaskResult result = new RootActivityContainer.FindTaskResult();
mStack.findTaskLocked(r1, result);
assertThat(result.mRecord).isNotNull();
// Using alias activity to find task.
final ActivityRecord r2 = new ActivityBuilder(mService).setComponent(
alias).setTargetActivity(targetActivity).build();
result = new RootActivityContainer.FindTaskResult();
mStack.findTaskLocked(r2, result);
assertThat(result.mRecord).isNotNull();
}
@Test
public void testMoveStackToBackIncludingParent() {
final ActivityDisplay display = addNewActivityDisplayAt(ActivityDisplay.POSITION_TOP);