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

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

Merge "Keep overlay displays in the default power group" into main

parents 4df2c634 569d5ad3

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

+2 −1
Original line number Diff line number Diff line
@@ -123,7 +123,8 @@ class DisplayGroupAllocator { 
        // desktop mode not supported on device or this display

        // or display is internal, and should be in a different group to the

        // projected and extended mode displays.

        if (!mCanDeviceEnterDesktopMode || type == Display.TYPE_INTERNAL) {

        if (!mCanDeviceEnterDesktopMode || type == Display.TYPE_INTERNAL

                || type == Display.TYPE_OVERLAY) {

            return REASON_NON_DESKTOP;

        }

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

+2 −1
Original line number Diff line number Diff line
@@ -1149,7 +1149,8 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { 
            Slog.i(TAG, "Setting new display group " + groupId + " for display "

                    + displayId + ", from previous group: "

                    + (oldGroup != null ? oldGroup.getGroupId() : "null")

                    + ", for reason: " + mDisplayGroupAllocator.getReason());

                    + ", for reason: " + mDisplayGroupAllocator.getReason()

                    + ", with flags: " + newGroup.getFlags());

        }

    }