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

Merge "RESTRICT AUTOMERGE Create separated tasks for different apps from startActivities" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-10 15:06:13 +00:00
committed by Android (Google) Code Review
parent 874c974f73 973ecc619c
commit 834e880978
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/am/ActivityStarter.java
View File

@@ -940,6 +940,8 @@ class ActivityStarter {
} else {
callingPid = callingUid = -1;
}
boolean forceNewTask = false;
final int filterCallingUid = callingUid >= 0 ? callingUid : realCallingUid;
final long origId = Binder.clearCallingIdentity();
try {
synchronized (mService) {
@@ -959,6 +961,9 @@ class ActivityStarter {
// Don't modify the client's object!
intent = new Intent(intent);
if (forceNewTask) {
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
// Collect information about the target of the Intent.
ActivityInfo aInfo = mSupervisor.resolveActivity(intent, resolvedTypes[i], 0,
@@ -984,7 +989,17 @@ class ActivityStarter {
return res;
}
resultTo = outActivity[0] != null ? outActivity[0].appToken : null;
final ActivityRecord started = outActivity[0];
if (started != null && started.getUid() == filterCallingUid) {
// Only the started activity which has the same uid as the source caller can
// be the caller of next activity.
resultTo = started.appToken;
forceNewTask = false;
} else {
// Different apps not adjacent to the caller are forced to be new task.
resultTo = null;
forceNewTask = true;
}
}
}
} finally {