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

Commit 0a012ba5 authored by Filip Gruszczynski's avatar Filip Gruszczynski
Browse files

Delete overscan setting by both unique id and name. 

When overscan with only zeros is set, it removes an entry by display's
unique identifier. It turns out in the past the readable name must have
been used in the past and there is a lingering value in the xml file.
This CL purges also the display name entry.

Bug: 22357152
Change-Id: Ie2daf76677eb96df474acb546491194d0aaf8bc0
parent c3d69a79

services/core/java/com/android/server/wm/DisplaySettings.java

+7 −4
Original line number Diff line number Diff line
@@ -78,17 +78,20 @@ public class DisplaySettings { 
        }

    }



    public void setOverscanLocked(String name, int left, int top, int right, int bottom) {

    public void setOverscanLocked(String uniqueId, String name, int left, int top, int right,

            int bottom) {

        if (left == 0 && top == 0 && right == 0 && bottom == 0) {

            // Right now all we are storing is overscan; if there is no overscan,

            // we have no need for the entry.

            mEntries.remove(uniqueId);

            // Legacy name might have been in used, so we need to clear it.

            mEntries.remove(name);

            return;

        }

        Entry entry = mEntries.get(name);

        Entry entry = mEntries.get(uniqueId);

        if (entry == null) {

            entry = new Entry(name);

            mEntries.put(name, entry);

            entry = new Entry(uniqueId);

            mEntries.put(uniqueId, entry);

        }

        entry.overscanLeft = left;

        entry.overscanTop = top;

services/core/java/com/android/server/wm/WindowManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -8541,7 +8541,8 @@ public class WindowManagerService extends IWindowManager.Stub 
            displayInfo.overscanBottom = bottom;

        }



        mDisplaySettings.setOverscanLocked(displayInfo.uniqueId, left, top, right, bottom);

        mDisplaySettings.setOverscanLocked(displayInfo.uniqueId, displayInfo.name, left, top,

                right, bottom);

        mDisplaySettings.writeSettingsLocked();



        reconfigureDisplayLocked(displayContent);