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

Merge "Stop supporting System UID to embed a separate task" into tm-dev

Browse Source
This commit is contained in:
Louis Chang
2022-03-10 06:07:09 +00:00
committed by Android (Google) Code Review
parent bf3f189a34 0543b2123d
commit dac2c8c645
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2023,22 +2023,12 @@ class ActivityStarter {
private boolean canEmbedActivity(@NonNull TaskFragment taskFragment, private boolean canEmbedActivity(@NonNull TaskFragment taskFragment,
@NonNull ActivityRecord starting, boolean newTask, Task targetTask) { @NonNull ActivityRecord starting, boolean newTask, Task targetTask) {
final Task hostTask = taskFragment.getTask(); final Task hostTask = taskFragment.getTask();
if (hostTask == null) { // Not allowed embedding a separate task or without host task.
if (hostTask == null || newTask || targetTask != hostTask) {
return false; return false;
} }
// Allowing the embedding if the task is owned by system. return taskFragment.isAllowedToEmbedActivity(starting);
final int hostUid = hostTask.effectiveUid;
if (UserHandle.getAppId(hostUid) == Process.SYSTEM_UID) {
return true;
}
if (!taskFragment.isAllowedToEmbedActivity(starting)) {
return false;
}
// Not allowed embedding task.
return !newTask && (targetTask == null || targetTask == hostTask);
} }
/** /**