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

Commit 41bb77bd authored by Filip Gruszczynski's avatar Filip Gruszczynski Committed by Android Git Automerger
Browse files

am ebb56d9b: am 550f1d4e: Merge "Delete overscan setting by both unique id and... 

am ebb56d9b: am 550f1d4e: Merge "Delete overscan setting by both unique id and name." into cw-d-mr1-dev

* commit 'ebb56d9b':
  Delete overscan setting by both unique id and name.
parents c2bf95b0 ebb56d9b

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

+7 −4
Original line number Diff line number Diff line
@@ -79,17 +79,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
@@ -8681,7 +8681,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);