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

Commit af23c6cd authored by Rupesh Bansal's avatar Rupesh Bansal Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in LogicalDisplayMapper" into main

parents 45623f0b 666f92f9

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

+2 −2
Original line number Diff line number Diff line
@@ -355,8 +355,8 @@ class LogicalDisplayMapper implements DisplayDeviceRepository.Listener { 
    public SparseArray<int[]> getDisplayIdsByGroupIdLocked() {

        SparseArray<int[]> displayIdsByGroupIds = new SparseArray<>();

        for (int i = 0; i < mDisplayGroups.size(); i++) {

            int groupId = mDisplayGroups.get(i).getGroupId();

            displayIdsByGroupIds.put(groupId, getDisplayIdsForGroupLocked(groupId));

            final int displayGroupId = mDisplayGroups.keyAt(i);

            displayIdsByGroupIds.put(displayGroupId, getDisplayIdsForGroupLocked(displayGroupId));

        }

        return displayIdsByGroupIds;

    }