diff options
| -rw-r--r-- | services/core/java/com/android/server/display/DisplayManagerService.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index d35d193ebff2..78b697d13f7b 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -1716,7 +1716,20 @@ public final class DisplayManagerService extends SystemService { final Point userPreferredResolution = mPersistentDataStore.getUserPreferredResolution(device); final float refreshRate = mPersistentDataStore.getUserPreferredRefreshRate(device); - if (userPreferredResolution == null && Float.isNaN(refreshRate)) { + // If value in persistentDataStore is null, preserving the mode from systemPreferredMode. + // This is required because in some devices, user-preferred mode was not stored in + // persistentDataStore, but was stored in a config which is returned through + // systemPreferredMode. + if ((userPreferredResolution == null && Float.isNaN(refreshRate)) + || (userPreferredResolution.equals(0, 0) && refreshRate == 0.0f)) { + Display.Mode systemPreferredMode = device.getSystemPreferredDisplayModeLocked(); + if (systemPreferredMode == null) { + return; + } + storeModeInPersistentDataStoreLocked( + display.getDisplayIdLocked(), systemPreferredMode.getPhysicalWidth(), + systemPreferredMode.getPhysicalHeight(), systemPreferredMode.getRefreshRate()); + device.setUserPreferredDisplayModeLocked(systemPreferredMode); return; } Display.Mode.Builder modeBuilder = new Display.Mode.Builder(); |