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

Merge "Ensure that we are removing recent tasks for a user including their profiles" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-19 06:56:51 +00:00
committed by Android (Google) Code Review
parent 1b92e90402 cdd4c3fa98
commit 3da53d5297
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2717,7 +2717,8 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
if (activityOptions != null) { if (activityOptions != null) {
activityType = activityOptions.getLaunchActivityType(); activityType = activityOptions.getLaunchActivityType();
windowingMode = activityOptions.getLaunchWindowingMode(); windowingMode = activityOptions.getLaunchWindowingMode();
if (activityOptions.freezeRecentTasksReordering()) { if (activityOptions.freezeRecentTasksReordering()
&& mRecentTasks.isCallerRecents(callingUid)) {
mRecentTasks.setFreezeTaskListReordering(); mRecentTasks.setFreezeTaskListReordering();
} }
} }

4
services/core/java/com/android/server/wm/RecentTasks.java
View File

@@ -653,9 +653,11 @@ class RecentTasks {
} }
void removeAllVisibleTasks(int userId) { void removeAllVisibleTasks(int userId) {
Set<Integer> profileIds = getProfileIds(userId);
for (int i = mTasks.size() - 1; i >= 0; --i) { for (int i = mTasks.size() - 1; i >= 0; --i) {
final TaskRecord tr = mTasks.get(i); final TaskRecord tr = mTasks.get(i);
if (tr.userId == userId && isVisibleRecentTask(tr)) { if (!profileIds.contains(tr.userId)) continue;
if (isVisibleRecentTask(tr)) {
mTasks.remove(i); mTasks.remove(i);
notifyTaskRemoved(tr, true /* wasTrimmed */, true /* killProcess */); notifyTaskRemoved(tr, true /* wasTrimmed */, true /* killProcess */);
} }

11
services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java
View File

@@ -860,14 +860,19 @@ public class RecentTasksTest extends ActivityTestsBase {
.build(); .build();
mRecentTasks.add(t1); mRecentTasks.add(t1);
TaskRecord t2 = createTaskBuilder(".Task1") TaskRecord t2 = createTaskBuilder(".Task2")
.setUserId(TEST_USER_1_ID) .setUserId(TEST_QUIET_USER_ID)
.build(); .build();
mRecentTasks.add(t2); mRecentTasks.add(t2);
TaskRecord t3 = createTaskBuilder(".Task3")
.setUserId(TEST_USER_1_ID)
.build();
mRecentTasks.add(t3);
// Remove all the visible tasks and ensure that they are removed // Remove all the visible tasks and ensure that they are removed
mRecentTasks.removeAllVisibleTasks(TEST_USER_0_ID); mRecentTasks.removeAllVisibleTasks(TEST_USER_0_ID);
assertTrimmed(t1); assertTrimmed(t1, t2);
} }
@Test @Test