From cf0f740e39f79da3fc8367c61ed473273248e8c1 Mon Sep 17 00:00:00 2001 From: Mark Renouf Date: Thu, 30 Oct 2014 16:57:30 -0400 Subject: 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 --- services/core/java/com/android/server/wm/DisplaySettings.java | 3 +++ 1 file changed, 3 insertions(+) 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; -- cgit v1.2.3-59-g8ed1b