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

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

Merge "Add debug log to getPossibleDisplayInfo" into main

parents 40388fab 6b225cbc

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

+4 −0
Original line number Diff line number Diff line
@@ -4841,6 +4841,8 @@ public final class DisplayManagerService extends SystemService { 
                }

                final int[] supportedStates =

                        mDeviceStateManager.getSupportedStateIdentifiers();

                // TODO(b/352019542): remove the log once b/345960547 is fixed.

                Slog.d(TAG, "supportedStates=" + Arrays.toString(supportedStates));

                DisplayInfo displayInfo;

                for (int state : supportedStates) {

                    displayInfo = mLogicalDisplayMapper.getDisplayInfoForStateLocked(state,
@@ -4849,6 +4851,8 @@ public final class DisplayManagerService extends SystemService { 
                        possibleInfo.add(displayInfo);

                    }

                }

                // TODO(b/352019542): remove the log once b/345960547 is fixed.

                Slog.d(TAG, "possibleInfos=" + possibleInfo);

                return possibleInfo;

            }

        }

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

+4 −0
Original line number Diff line number Diff line
@@ -389,11 +389,15 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { 
        // Retrieve the layout for this particular state.

        final Layout layout = mDeviceStateToLayoutMap.get(deviceState);

        if (layout == null) {

            // TODO(b/352019542): remove the log once b/345960547 is fixed.

            Slog.d(TAG, "Cannot get layout for given state:" + deviceState);

            return null;

        }

        // Retrieve the details of the given display within this layout.

        Layout.Display display = layout.getById(displayId);

        if (display == null) {

            // TODO(b/352019542): remove the log once b/345960547 is fixed.

            Slog.d(TAG, "Cannot get display for given layout:" + layout);

            return null;

        }

        // Retrieve the display info for the display that matches the display id.