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

Commit de733442 authored by Charles Chen's avatar Charles Chen Committed by Android Build Coastguard Worker
Browse files

Add debug log to getPossibleDisplayInfo 

Test: manual
Bug: 345960547
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6b225cbc7375496855a9075c21cd350bc216c3b7)
Merged-In: I32a103f81e86d59d462ddb59d3e0fed6865e3364
Change-Id: I32a103f81e86d59d462ddb59d3e0fed6865e3364
parent d49e7696

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

+4 −0
Original line number Diff line number Diff line
@@ -4782,6 +4782,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,
@@ -4790,6 +4792,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.