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

Commit 4dec11b7 authored by Kriti Dang's avatar Kriti Dang
Browse files

Remove the code to get user preferred value from systemPreferredMode if 

it was not stored in PersistentDataStore

This code is no longer required, as the value is now crrectly stored in
PersistentDataStore.

Bug: 268603516
Test: Tested manually
Change-Id: I921c927965771eb226749e0b9f8c9437ba5914c3
parent fd6cd7ff

services/core/java/com/android/server/display/DisplayManagerService.java

+1 −14
Original line number Diff line number Diff line
@@ -1940,20 +1940,7 @@ public final class DisplayManagerService extends SystemService { 
        final Point userPreferredResolution =

                mPersistentDataStore.getUserPreferredResolution(device);

        final float refreshRate = mPersistentDataStore.getUserPreferredRefreshRate(device);

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

        if (userPreferredResolution == null && Float.isNaN(refreshRate)) {

            return;

        }

        Display.Mode.Builder modeBuilder = new Display.Mode.Builder();