aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-05 02:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Handle race between creating and assigning RemoteTargetHandles" into sc-v2-dev

Browse Source
This commit is contained in:
Vinit Nayak
2021-10-16 05:39:24 +00:00
committed by Android (Google) Code Review
parent 4ff90a435e 15028e030b
commit 30d46ef842
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
quickstep/src/com/android/quickstep/RemoteTargetGluer.java
View File

@@ -16,9 +16,8 @@
package com.android.quickstep;
import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;
import android.content.Context;
import android.util.Log;
import androidx.annotation.Nullable;
@@ -34,7 +33,9 @@ import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
* {@link TaskViewSimulator}
*/
public class RemoteTargetGluer {
private final RemoteTargetHandle[] mRemoteTargetHandles;
private static final String TAG = "RemoteTargetGluer";
private RemoteTargetHandle[] mRemoteTargetHandles;
private SplitConfigurationOptions.StagedSplitBounds mStagedSplitBounds;
/**
@@ -93,6 +94,13 @@ public class RemoteTargetGluer {
public RemoteTargetHandle[] assignTargetsForSplitScreen(RemoteAnimationTargets targets) {
int[] splitIds = LauncherSplitScreenListener.INSTANCE.getNoCreate()
.getRunningSplitTaskIds();
if (splitIds.length == 0 && mRemoteTargetHandles.length > 1) {
// There's a chance that between the creation of this class and assigning targets,
// LauncherSplitScreenListener may have received callback that removes split
mRemoteTargetHandles = new RemoteTargetHandle[]{mRemoteTargetHandles[0]};
Log.w(TAG, "splitTaskIds changed between creation and assignment");
}
RemoteAnimationTargetCompat primaryTaskTarget;
RemoteAnimationTargetCompat secondaryTaskTarget;
if (mRemoteTargetHandles.length == 1) {