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

Commit d7ef768f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adding nullcheck while launching task during quickswitch" into... 

Merge "Adding nullcheck while launching task during quickswitch" into ub-launcher3-rvc-qpr-dev am: 6381d382

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12119527

Change-Id: I48126c4905e20135cdb7091777d9cdf0e2d5f6ba
parents f67fe553 6381d382

quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandler.java

+10 −2
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */

package com.android.quickstep;



import static android.widget.Toast.LENGTH_SHORT;



import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
@@ -27,11 +29,13 @@ import android.graphics.Rect; 
import android.os.Build;

import android.util.Log;

import android.view.MotionEvent;

import android.widget.Toast;



import androidx.annotation.CallSuper;

import androidx.annotation.UiThread;



import com.android.launcher3.DeviceProfile;

import com.android.launcher3.R;

import com.android.launcher3.statemanager.StatefulActivity;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.util.VibratorWrapper;
@@ -138,10 +142,10 @@ public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extend 
            mRecentsView.getNextPageTaskView().launchTask(false /* animate */,

                    true /* freezeTaskList */);

        } else {

            int taskId = mRecentsView.getNextPageTaskView().getTask().key.id;

            if (!mCanceled) {

                TaskView nextTask = mRecentsView.getTaskView(taskId);

                TaskView nextTask = mRecentsView.getNextPageTaskView();

                if (nextTask != null) {

                    int taskId = nextTask.getTask().key.id;

                    mGestureState.updateLastStartedTaskId(taskId);

                    boolean hasTaskPreviouslyAppeared = mGestureState.getPreviouslyAppearedTaskIds()

                            .contains(taskId);
@@ -158,6 +162,10 @@ public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extend 
                                    mRecentsAnimationController.finish(true /* toRecents */, null);

                                }

                            }, MAIN_EXECUTOR.getHandler());

                } else {

                    mActivityInterface.onLaunchTaskFailed();

                    Toast.makeText(mContext, R.string.activity_not_available, LENGTH_SHORT).show();

                    mRecentsAnimationController.finish(true /* toRecents */, null);

                }

            }

            mCanceled = false;