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

Commit e0214374 authored by Rupesh Bansal's avatar Rupesh Bansal
Browse files

Dont mark adjacent display group if in non-desktop 

We currently mark the displays requesting for a new group and are in non
desktop mode. This would cause issues for setups like Auto where there
can potentially be multiple external displays comprised of multiple
groups

Bug: 432178456
Test: Manual
Flag: EXEMPT trivial change
Change-Id: Iccc90bdcee8c522149f2b4c852a4fdebd06405ad
parent acf3ecd2

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);

            }

        }