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

Merge "Find activity in task with same user" into tm-qpr-dev am: fc9ccbb8a0 am: a3e9c75022

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19741912

Change-Id: I1c73d09e09d56e6649d5b4d7383999ac5061b1b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jeff Chang
2022-09-05 00:49:46 +00:00
committed by Automerger Merge Worker
parent c77e365900 a3e9c75022
commit 20c05fdac0
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2107,7 +2107,8 @@ class ActivityStarter {
// already be running somewhere in the history, and we want to shuffle it to
// the front of the root task if so.
final ActivityRecord act =
targetTask.findActivityInHistory(mStartActivity.mActivityComponent);
targetTask.findActivityInHistory(mStartActivity.mActivityComponent,
mStartActivity.mUserId);
if (act != null) {
final Task task = act.getTask();
task.moveActivityToFrontLocked(act);

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

@@ -1634,7 +1634,7 @@ class Task extends TaskFragment {
* or {@code null} if none was found.
*/
private ActivityRecord clearTopActivities(ActivityRecord newR, int launchFlags) {
final ActivityRecord r = findActivityInHistory(newR.mActivityComponent);
final ActivityRecord r = findActivityInHistory(newR.mActivityComponent, newR.mUserId);
if (r == null) return null;
final PooledPredicate f = PooledLambda.obtainPredicate(Task::finishActivityAbove,
@@ -1750,17 +1750,18 @@ class Task extends TaskFragment {
* Find the activity in the history task within the given task. Returns
* the index within the history at which it's found, or < 0 if not found.
*/
ActivityRecord findActivityInHistory(ComponentName component) {
ActivityRecord findActivityInHistory(ComponentName component, int userId) {
final PooledPredicate p = PooledLambda.obtainPredicate(Task::matchesActivityInHistory,
PooledLambda.__(ActivityRecord.class), component);
PooledLambda.__(ActivityRecord.class), component, userId);
final ActivityRecord r = getActivity(p);
p.recycle();
return r;
}
private static boolean matchesActivityInHistory(
ActivityRecord r, ComponentName activityComponent) {
return !r.finishing && r.mActivityComponent.equals(activityComponent);
ActivityRecord r, ComponentName activityComponent, int userId) {
return !r.finishing && r.mActivityComponent.equals(activityComponent)
&& r.mUserId == userId;
}
/** Updates the last task description values. */