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

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

Merge "Dont mark adjacent display group if in non-desktop" into main

parents f4243b2d e0214374

services/core/java/com/android/server/display/LogicalDisplayMapper.java

+1 −3
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static android.view.Display.DEFAULT_DISPLAY; 


import static com.android.server.display.DisplayGroupAllocator.GROUP_TYPE_PRIMARY;

import static com.android.server.display.DisplayGroupAllocator.REASON_EXTENDED;

import static com.android.server.display.DisplayGroupAllocator.REASON_NON_DESKTOP;

import static com.android.server.display.DisplayGroupAllocator.REASON_PROJECTED;

import static com.android.server.display.DisplayGroupAllocator.calculateGroupId;
@@ -1137,8 +1136,7 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { 
            if (groupId != Display.DEFAULT_DISPLAY_GROUP

                    && (displayDeviceInfo.type == Display.TYPE_INTERNAL

                            || displayDeviceInfo.type == Display.TYPE_EXTERNAL)

                    && (reason == REASON_PROJECTED || reason == REASON_EXTENDED

                    || reason == REASON_NON_DESKTOP)) {

                    && (reason == REASON_PROJECTED || reason == REASON_EXTENDED)) {

                newGroup.setFlags(DisplayGroup.FLAG_DEFAULT_GROUP_ADJACENT);

            }

        }