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

Commit fc9b97ef authored by Kriti Dang's avatar Kriti Dang Committed by Android (Google) Code Review
Browse files

Merge "Remove the preference to PersistentDataStore setting in case when... 

Merge "Remove the preference to PersistentDataStore setting in case when global setting is being set."
parents 0a061936 816a2399

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

+1 −9
Original line number Original line Diff line number Diff line
@@ -1852,15 +1852,7 @@ public final class DisplayManagerService extends SystemService { 
        Settings.Global.putInt(mContext.getContentResolver(),

        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.USER_PREFERRED_RESOLUTION_WIDTH, resolutionWidth);

                Settings.Global.USER_PREFERRED_RESOLUTION_WIDTH, resolutionWidth);

        mDisplayDeviceRepo.forEachLocked((DisplayDevice device) -> {

        mDisplayDeviceRepo.forEachLocked((DisplayDevice device) -> {

            // If there is a display specific mode, don't override that

            final Point deviceUserPreferredResolution =

                    mPersistentDataStore.getUserPreferredResolution(device);

            final float deviceRefreshRate =

                    mPersistentDataStore.getUserPreferredRefreshRate(device);

            if (!isValidResolution(deviceUserPreferredResolution)

                    && !isValidRefreshRate(deviceRefreshRate)) {

            device.setUserPreferredDisplayModeLocked(mode);

            device.setUserPreferredDisplayModeLocked(mode);

            }

        });

        });

    }

    }