diff options
| author | 2014-10-30 16:57:30 -0400 | |
|---|---|---|
| committer | 2014-12-12 18:24:58 +0000 | |
| commit | d3adc51a1b845e37845af6a885ce7371c2ce252c (patch) | |
| tree | c9712ea7b58eb41206eae0a3590f3e1c0666a1de | |
| parent | 08c723345110d547729c16075bfda264ca767285 (diff) | |
If no display settings are matched, return the first one. DO NOT MERGE
Language changes will prevent previously saved display settings from
being loaded. This provides a fallback in the event a single entry exists
but does not match the current (localized) name of the Built-In Display.
BUG: 18130296
BUG: 18190800
Change-Id: Ibeff56045fc5713b9f79707dfb92bafc9fadd84f
(cherry picked from commit cf0f740e39f79da3fc8367c61ed473273248e8c1)
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplaySettings.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/DisplaySettings.java b/services/core/java/com/android/server/wm/DisplaySettings.java index 34d1a647e10f..dd8a9b8f68d1 100644 --- a/services/core/java/com/android/server/wm/DisplaySettings.java +++ b/services/core/java/com/android/server/wm/DisplaySettings.java @@ -66,6 +66,9 @@ public class DisplaySettings { public void getOverscanLocked(String name, Rect outRect) { Entry entry = mEntries.get(name); + if (entry == null && mEntries.size() == 1) { + entry = mEntries.values().iterator().next(); + } if (entry != null) { outRect.left = entry.overscanLeft; outRect.top = entry.overscanTop; |