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

Commit 64631d9d authored by Kriti Dang's avatar Kriti Dang Committed by Automerger Merge Worker
Browse files

Merge "Retrive the value of user-pref, if its not stored in... 

Merge "Retrive the value of user-pref, if its not stored in persistentDataStore" into tm-qpr-dev am: 7239296d am: 55376247

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20261068



Change-Id: I22eef4b63541c6a8fc59816ef3f69426dcb97fa6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 417f6f02 55376247

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

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

        final Point userPreferredResolution =

                mPersistentDataStore.getUserPreferredResolution(device);

                mPersistentDataStore.getUserPreferredResolution(device);

        final float refreshRate = mPersistentDataStore.getUserPreferredRefreshRate(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;

            return;

        }

        }

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

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