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

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

Dont record adjacent display if non-internal 

This fixes the bug where the FLAG_DEFAULT_GROUP_ADJACENT is set for
virtual displays on cuttle fish device. This is because the desktop mode
is not enabled on these devices, which forces the content mode for these
displays to be set to non-desktop and makes it eligible for the flag. We
are now explicitly adding the check of internal and external displays
before setting the flag

Bug: 414444200
Flag: EXEMPT Trivial Change
Test: Manual
Change-Id: I3b2afb75d3bdbc17e197a60bdfbb1604787f097f
parent bde539fd

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

+9 −2
Original line number Diff line number Diff line
@@ -1131,8 +1131,15 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { 


            int reason = mDisplayGroupAllocator.getContentModeForDisplayLocked(

                    display, displayDeviceInfo.type);

            if (reason == REASON_PROJECTED || reason == REASON_EXTENDED

                    || reason == REASON_NON_DESKTOP) {



            // We set the flag only if the group being created is a non-default group, is internal

            // or external(We don't want to set FLAG_DEFAULT_GROUP_ADJACENT for virtual displays)

            // and is in projected,extended or non desktop mode

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

                newGroup.setFlags(DisplayGroup.FLAG_DEFAULT_GROUP_ADJACENT);

            }

        }