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

Merge "Start activity in the embedded TaskFragment if allowed" into sc-v2-dev am: 8aedf643cb am: 6a19b768f3

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

Change-Id: Ie9dccbd388935bf6fbecdf55c7c57433009fef38
This commit is contained in:
Louis Chang
2021-07-19 12:44:48 +00:00
committed by Automerger Merge Worker
parent 420e477391 6a19b768f3
commit dd351bd2f8
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
package com.android.server.wm;
import static android.Manifest.permission.ACTIVITY_EMBEDDING;
import static android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND;
import static android.app.Activity.RESULT_CANCELED;
import static android.app.ActivityManager.START_ABORTED;
@@ -2717,6 +2718,31 @@ class ActivityStarter {
mIntentDelivered = true;
}
/**
* Return {@code true} if the {@param task} has child {@code TaskFragment}s and the
* {@param activity} can be embedded in. Otherwise, return {@code false}
*/
private boolean canActivityBeEmbedded(@NonNull ActivityRecord activity, @NonNull Task task) {
if (task.isLeafTaskFragment()) {
return false;
}
final int taskUid = task.effectiveUid;
// Allowing the activity be embedded into leaf TaskFragment if the task is owned by system.
if (taskUid == Process.SYSTEM_UID) {
return true;
}
// Allowing embedding if the task is owned by an app that has the ACTIVITY_EMBEDDING
// permission
if (mService.checkPermission(ACTIVITY_EMBEDDING, -1, taskUid) == PERMISSION_GRANTED) {
return true;
}
// Allowing embedding if the activity is from the same app that owned the task
return activity.isUid(taskUid);
}
private void addOrReparentStartingActivity(@NonNull Task task, String reason) {
TaskFragment newParent = task;
if (mInTaskFragment != null) {
@@ -2728,7 +2754,12 @@ class ActivityStarter {
} else {
newParent = mInTaskFragment;
}
} else if (canActivityBeEmbedded(mStartActivity, task)) {
// Use the child TaskFragment (if any) as the new parent if the activity can be embedded
final ActivityRecord top = task.topRunningActivity();
newParent = top != null ? top.getTaskFragment() : task;
}
if (mStartActivity.getTaskFragment() == null
|| mStartActivity.getTaskFragment() == newParent) {
newParent.addChild(mStartActivity, POSITION_TOP);