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

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

Fix regression in unfreezing the recent task list 

- On certain devices, the HWC ScreenDecorOverlay is full size (not just
  the corners), and the previous logic to determine if a touch is
  in an app inadvertently finds this window (it's above everything
  else) and as a result incorrectly assumes that the touch is not going
  to an app window.  Instead, use the alternate existing method for
  finding the app window under a point which takes into account the
  touchable region of the window.

Fixes: 268285353
Test: Quickswitch to previous app, tap on the app and ensure task
      list is unfrozen (you can't quickswitch back to previous app)
Change-Id: I2580dc8e8ed463c6d994f44382138ce2ba5bf890
Merged-In: I2580dc8e8ed463c6d994f44382138ce2ba5bf890
parent 3ef8a24a

services/core/java/com/android/server/wm/DisplayContent.java

+0 −21
Original line number Diff line number Diff line
@@ -3098,27 +3098,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        });

    }



    /**

     * Returns true if the input point is within an app window.

     */

    boolean pointWithinAppWindow(int x, int y) {

        final int[] targetWindowType = {-1};

        final PooledConsumer fn = PooledLambda.obtainConsumer((w, nonArg) -> {

            if (targetWindowType[0] != -1) {

                return;

            }



            if (w.isOnScreen() && w.isVisible() && w.getFrame().contains(x, y)) {

                targetWindowType[0] = w.mAttrs.type;

                return;

            }

        }, PooledLambda.__(WindowState.class), mTmpRect);

        forAllWindows(fn, true /* traverseTopToBottom */);

        fn.recycle();

        return FIRST_APPLICATION_WINDOW <= targetWindowType[0]

                && targetWindowType[0] <= LAST_APPLICATION_WINDOW;

    }



    /**

     * Find the task whose outside touch area (for resizing) (x, y) falls within.

     * Returns null if the touch doesn't fall into a resizing area.

services/core/java/com/android/server/wm/RecentTasks.java

+10 −2
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK; 
import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT;

import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;

import static android.os.Process.SYSTEM_UID;

import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW;

import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;



import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_TASKS;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_RECENTS;
@@ -215,10 +217,16 @@ class RecentTasks { 
            int y = (int) ev.getY();

            mService.mH.post(PooledLambda.obtainRunnable((nonArg) -> {

                synchronized (mService.mGlobalLock) {

                    // Unfreeze the task list once we touch down in a task

                    final RootWindowContainer rac = mService.mRootWindowContainer;

                    final DisplayContent dc = rac.getDisplayContent(displayId).mDisplayContent;

                    if (dc.pointWithinAppWindow(x, y)) {

                    final WindowState win = dc.getTouchableWinAtPointLocked((float) x, (float) y);

                    if (win == null) {

                        return;

                    }

                    // Unfreeze the task list once we touch down in a task

                    final boolean isAppWindowTouch = FIRST_APPLICATION_WINDOW <= win.mAttrs.type

                            && win.mAttrs.type <= LAST_APPLICATION_WINDOW;

                    if (isAppWindowTouch) {

                        final Task stack = mService.getTopDisplayFocusedRootTask();

                        final Task topTask = stack != null ? stack.getTopMostTask() : null;

                        resetFreezeTaskListReordering(topTask);