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

Merge "Renaming to initial TaskFragment token" into sc-v2-dev

Browse Source
This commit is contained in:
Louis Chang
2021-08-10 03:41:20 +00:00
committed by Android (Google) Code Review
parent 7e62af128a 5eff403fff
commit 7e59a8f17c
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/app/ActivityThread.java
View File

@@ -530,8 +530,9 @@ public final class ActivityThread extends ClientTransactionHandler
// A reusable token for other purposes, e.g. content capture, translation. It shouldn't be // A reusable token for other purposes, e.g. content capture, translation. It shouldn't be
// used without security checks // used without security checks
public IBinder shareableActivityToken; public IBinder shareableActivityToken;
// The token of the TaskFragment that embedded this activity. // The token of the initial TaskFragment that embedded this activity. Do not rely on it
@Nullable public IBinder mTaskFragmentToken; // after creation because the activity could be reparented.
@Nullable public IBinder mInitialTaskFragmentToken;
int ident; int ident;
@UnsupportedAppUsage @UnsupportedAppUsage
Intent intent; Intent intent;
@@ -626,7 +627,7 @@ public final class ActivityThread extends ClientTransactionHandler
boolean isForward, ProfilerInfo profilerInfo, ClientTransactionHandler client, boolean isForward, ProfilerInfo profilerInfo, ClientTransactionHandler client,
IBinder assistToken, FixedRotationAdjustments fixedRotationAdjustments, IBinder assistToken, FixedRotationAdjustments fixedRotationAdjustments,
IBinder shareableActivityToken, boolean launchedFromBubble, IBinder shareableActivityToken, boolean launchedFromBubble,
IBinder taskFragmentToken) { IBinder initialTaskFragmentToken) {
this.token = token; this.token = token;
this.assistToken = assistToken; this.assistToken = assistToken;
this.shareableActivityToken = shareableActivityToken; this.shareableActivityToken = shareableActivityToken;
@@ -648,7 +649,7 @@ public final class ActivityThread extends ClientTransactionHandler
mActivityOptions = activityOptions; mActivityOptions = activityOptions;
mPendingFixedRotationAdjustments = fixedRotationAdjustments; mPendingFixedRotationAdjustments = fixedRotationAdjustments;
mLaunchedFromBubble = launchedFromBubble; mLaunchedFromBubble = launchedFromBubble;
mTaskFragmentToken = taskFragmentToken; mInitialTaskFragmentToken = initialTaskFragmentToken;
init(); init();
} }

2
libs/WindowManager/Jetpack/src/androidx/window/extensions/organizer/SplitController.java
View File

@@ -270,7 +270,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
private TaskFragmentContainer getContainerWithActivity(@NonNull IBinder activityToken, private TaskFragmentContainer getContainerWithActivity(@NonNull IBinder activityToken,
Activity activityToAdd) { Activity activityToAdd) {
final IBinder taskFragmentToken = ActivityThread.currentActivityThread().getActivityClient( final IBinder taskFragmentToken = ActivityThread.currentActivityThread().getActivityClient(
activityToken).mTaskFragmentToken; activityToken).mInitialTaskFragmentToken;
for (TaskFragmentContainer container : mContainers) { for (TaskFragmentContainer container : mContainers) {
if (container.hasActivity(activityToken)) { if (container.hasActivity(activityToken)) {
return container; return container;