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

Commit c148c409 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Register a display topology listener only when desktop mode can be enabled" into main

parents 5e3b7db2 81682e96

libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayController.java

+3 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import androidx.annotation.BinderThread; 
import com.android.window.flags.Flags;

import com.android.wm.shell.common.DisplayChangeController.OnDisplayChangingListener;

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

import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;

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



import java.util.ArrayList;
@@ -91,7 +92,8 @@ public class DisplayController { 
                onDisplayAdded(displayIds[i]);

            }



            if (Flags.enableConnectedDisplaysWindowDrag()) {

            if (Flags.enableConnectedDisplaysWindowDrag()

                    && DesktopModeStatus.canEnterDesktopMode(mContext)) {

                mDisplayManager.registerTopologyListener(mMainExecutor,

                        this::onDisplayTopologyChanged);

                onDisplayTopologyChanged(mDisplayManager.getDisplayTopology());