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

Commit b93e1848 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Remove server side task positioner" into main

parents 25277060 af553aff

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

+1 −18
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import static android.view.WindowManager.LayoutParams.isSystemAlertWindowType; 


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

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_TASK_POSITIONING;

import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;



import android.annotation.NonNull;
@@ -537,27 +536,11 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { 


    @Override

    public boolean startMovingTask(IWindow window, float startX, float startY) {

        if (DEBUG_TASK_POSITIONING) Slog.d(

                TAG_WM, "startMovingTask: {" + startX + "," + startY + "}");



        final long ident = Binder.clearCallingIdentity();

        try {

            return mService.mTaskPositioningController.startMovingTask(window, startX, startY);

        } finally {

            Binder.restoreCallingIdentity(ident);

        }

        return false;

    }



    @Override

    public void finishMovingTask(IWindow window) {

        if (DEBUG_TASK_POSITIONING) Slog.d(TAG_WM, "finishMovingTask");



        final long ident = Binder.clearCallingIdentity();

        try {

            mService.mTaskPositioningController.finishTaskPositioning(window);

        } finally {

            Binder.restoreCallingIdentity(ident);

        }

    }



    @Override

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

deleted100644 → 0
+0 −500

File deleted.

Preview size limit exceeded, changes collapsed.

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

deleted100644 → 0
+0 −250

File deleted.

Preview size limit exceeded, changes collapsed.

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

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ public class WindowManagerDebugConfig { 
    static final boolean DEBUG_LAYOUT_REPEATS = false;

    static final boolean DEBUG_WINDOW_TRACE = false;

    static final boolean DEBUG_TASK_MOVEMENT = false;

    static final boolean DEBUG_TASK_POSITIONING = false;

    static final boolean DEBUG_ROOT_TASK = false;

    static final boolean DEBUG_DISPLAY = false;

    static final boolean DEBUG_POWER = false;

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

+0 −2
Original line number Diff line number Diff line
@@ -1070,7 +1070,6 @@ public class WindowManagerService extends IWindowManager.Stub 
    /** Whether or not a layout can cause a wake up when theater mode is enabled. */

    boolean mAllowTheaterModeWakeFromLayout;



    final TaskPositioningController mTaskPositioningController;

    final DragDropController mDragDropController;



    /** For frozen screen animations. */
@@ -1428,7 +1427,6 @@ public class WindowManagerService extends IWindowManager.Stub 
        mAllowTheaterModeWakeFromLayout = context.getResources().getBoolean(

                com.android.internal.R.bool.config_allowTheaterModeWakeFromWindowLayout);



        mTaskPositioningController = new TaskPositioningController(this);

        mDragDropController = new DragDropController(this, mH.getLooper());



        mHighRefreshRateDenylist = HighRefreshRateDenylist.create(context.getResources());