Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete overscan setting by both unique id and name.

Browse Source 
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
This commit is contained in:
Filip Gruszczynski
2015-07-13 15:00:11 -07:00
parent c3d69a798e
commit 0a012ba55d
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/wm/DisplaySettings.java
View File

@@ -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;

3
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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);