Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df51c1ad authored by Winson Chung's avatar Winson Chung
Browse files

Try to detect and handle delayed quickswitch task launch failure 

- The main issue arises when a task is successfully launched from
  overview, but the activity later finishes (ie. during resume) which
  prevents the usual logic of resetting Launcher to a good state
  (ie. it can get stuck in overview with a blank or empty snapshot)

  In this case, the Launch will "succeed" so that onTaskLaunchFailed
  is not called, but then also silently fail (launched task finishes
  and Launcher is again resumed) before Launcher stops, which does the
  usual resetting of the state back to normal state after quickswitching.

  This change checks for this case by listening for the activity and
  transition state, and in the case where Launcher has not been stopped
  or is resumed again after the transition finishes, returns the
  user to the default home state.

  This primarily only affects quickswitch for now, as other launch
  failures leave the user in a valid state (ie. overview) while this
  issue will leave the user in background state while quickswitching.

Bug: 268448123
Test: Quickswitch to an activity that finishes when resumed
Change-Id: I7d554f8fd521f7bc480dc06930ad91eeef0f1a1a
parent 8ecacd36

quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java

+4 −0
Original line number Diff line number Diff line
@@ -207,6 +207,10 @@ public class TaskbarLauncherStateController { 
                    com.android.launcher3.taskbar.Utilities.setOverviewDragState(

                            mControllers, finalState.disallowTaskbarGlobalDrag(),

                            disallowLongClick, finalState.allowTaskbarInitialSplitSelection());

                    // LauncherTaskbarUIController depends on the state when checking whether

                    // to handle resume, so it should also be poked if current state changes

                    mLauncher.getTaskbarUIController().onLauncherResumedOrPaused(

                            mLauncher.hasBeenResumed());

                }

            };

quickstep/src/com/android/quickstep/RecentsModel.java

+3 −0
Original line number Diff line number Diff line
@@ -145,6 +145,9 @@ public class RecentsModel implements IconChangeListener, TaskStackChangeListener 
     * @param filter Returns true if GroupTask should be in the list of considerations

     */

    public void isTaskRemoved(int taskId, Consumer<Boolean> callback, Predicate<GroupTask> filter) {

        // Invalidate the existing list before checking to ensure this reflects the current state in

        // the system

        mTaskList.onRecentTasksChanged();

        mTaskList.getTasks(true /* loadKeysOnly */, (taskGroups) -> {

            for (GroupTask group : taskGroups) {

                if (group.containsTask(taskId)) {

quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsSta 
    }



    @Override

    public void startHome() {

    public void startHome(boolean animated) {

        mActivity.startHome();

        AbstractFloatingView.closeAllOpenViews(mActivity, mActivity.isStarted());

    }

quickstep/src/com/android/quickstep/util/TaskRemovedDuringLaunchListener.java

0 → 100644
+105 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.quickstep.util;



import static android.app.ActivityTaskManager.INVALID_TASK_ID;



import android.app.Activity;



import androidx.annotation.NonNull;



import com.android.launcher3.util.ActivityLifecycleCallbacksAdapter;

import com.android.quickstep.RecentsModel;



/**

 * This class tracks the failure of a task launch through the TaskView.launchTask() call, in an

 * edge case in which starting a new task may initially succeed (startActivity returns true), but

 * the launch ultimately fails if the activity finishes while it is resuming.

 *

 * There are two signals this class checks, the launcher lifecycle and the transition completion.

 * If we hit either of those signals and the task is no longer valid, then the registered failure

 * callback will be notified.

 */

public class TaskRemovedDuringLaunchListener implements ActivityLifecycleCallbacksAdapter {



    private Activity mActivity;

    private int mLaunchedTaskId = INVALID_TASK_ID;

    private Runnable mTaskLaunchFailedCallback = null;



    /**

     * Registers a failure listener callback if it detects a scenario in which an app launch

     * failed before the transition finished.

     */

    public void register(Activity activity, int launchedTaskId,

            @NonNull Runnable taskLaunchFailedCallback) {

        activity.registerActivityLifecycleCallbacks(this);

        mActivity = activity;

        mLaunchedTaskId = launchedTaskId;

        mTaskLaunchFailedCallback = taskLaunchFailedCallback;

    }



    /**

     * Unregisters the failure listener.

     */

    private void unregister() {

        mActivity.unregisterActivityLifecycleCallbacks(this);

        mActivity = null;

        mLaunchedTaskId = INVALID_TASK_ID;

        mTaskLaunchFailedCallback = null;

    }



    /**

     * Called when the transition finishes.

     */

    public void onTransitionFinished() {

        // The transition finished and Launcher was not stopped, check if the launch failed

        checkTaskLaunchFailed();

    }



    @Override

    public void onActivityStopped(Activity activity) {

        // The normal task launch case, Launcher stops and updates its state correctly

        unregister();

    }



    @Override

    public void onActivityResumed(Activity activity) {

        // The transition hasn't finished but Launcher was resumed, check if the launch failed

        checkTaskLaunchFailed();

    }



    @Override

    public void onActivityDestroyed(Activity activity) {

        // If we somehow don't get any of the above signals, then just unregister this listener

        unregister();

    }



    private void checkTaskLaunchFailed() {

        if (mLaunchedTaskId != INVALID_TASK_ID) {

            final int launchedTaskId = mLaunchedTaskId;

            final Runnable taskLaunchFailedCallback = mTaskLaunchFailedCallback;

            RecentsModel.INSTANCE.getNoCreate().isTaskRemoved(mLaunchedTaskId, (taskRemoved) -> {

                if (taskRemoved) {

                    ActiveGestureLog.INSTANCE.addLog("Launch failed, task (id=" + launchedTaskId

                            + ") finished mid transition");

                    taskLaunchFailedCallback.run();

                }

            }, (task) -> true /* filter */);

            unregister();

        }

    }

}

quickstep/src/com/android/quickstep/views/DesktopTaskView.java

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ public class DesktopTaskView extends TaskView { 
    }



    @Override

    public void launchTask(@NonNull Consumer<Boolean> callback, boolean freezeTaskList) {

    public void launchTask(@NonNull Consumer<Boolean> callback, boolean isQuickswitch) {

        launchTasks();

        callback.accept(true);

    }