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

Commit fc35225f authored by Jorge Gil's avatar Jorge Gil Committed by Android (Google) Code Review
Browse files

Merge "Fix wrong parameter order for main/bg thread executors" into main

parents bb088a21 d49e0d4a

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java

+2 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import com.android.wm.shell.common.SyncTransactionQueue; 
import com.android.wm.shell.freeform.FreeformTaskTransitionStarter;

import com.android.wm.shell.shared.FocusTransitionListener;

import com.android.wm.shell.shared.annotations.ShellBackgroundThread;

import com.android.wm.shell.shared.annotations.ShellMainThread;

import com.android.wm.shell.splitscreen.SplitScreenController;

import com.android.wm.shell.sysui.ShellInit;

import com.android.wm.shell.transition.FocusTransitionObserver;
@@ -119,8 +120,8 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel, FocusT 
    public CaptionWindowDecorViewModel(

            Context context,

            Handler mainHandler,

            @ShellMainThread ShellExecutor shellExecutor,

            @ShellBackgroundThread ShellExecutor bgExecutor,

            ShellExecutor shellExecutor,

            Choreographer mainChoreographer,

            IWindowManager windowManager,

            ShellInit shellInit,