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

Commit 7adf3f01 authored by Long Ling's avatar Long Ling Committed by android-build-merger
Browse files

Merge changes from topic "device_config_for_display_qpr1" into qt-qpr1-dev 

am: 30e9250f

Change-Id: I6db03bb92b73c799944764014acb31ebc3038165
parents 9926683e 30e9250f

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -3476,6 +3476,14 @@ public final class Settings { 
            }

        };













        /**













         * The user selected min refresh rate in frames per second.













         *













         * If this isn't set, 0 will be used.













         * @hide













         */













        public static final String MIN_REFRESH_RATE = "min_refresh_rate";



























        /**















         * The user selected peak refresh rate in frames per second.















         *

































core/tests/coretests/src/android/provider/SettingsBackupTest.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -93,6 +93,7 @@ public class SettingsBackupTest {













                    Settings.System.VOLUME_VOICE, // deprecated since API 2?















                    Settings.System.WHEN_TO_MAKE_WIFI_CALLS, // bug?















                    Settings.System.WINDOW_ORIENTATION_LISTENER_LOG, // used for debugging only













                    Settings.System.MIN_REFRESH_RATE, // depends on hardware capabilities















                    Settings.System.PEAK_REFRESH_RATE // depends on hardware capabilities















                    );

















































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



+248
−62


























File changed.
Preview size limit exceeded, changes collapsed.