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

Commit 119ed450 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 

am: 7adf3f01

Change-Id: Ia17a834fa382f31ca30a8df50063554dea0859b0
parents 81c10df6 7adf3f01

core/java/android/provider/Settings.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -3494,6 +3494,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.







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











         *







         *

































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



+1
−0




























Original line number
Original line
Diff line number
Diff line








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









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







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











                    Settings.System.WHEN_TO_MAKE_WIFI_CALLS, // bug?







                    Settings.System.WHEN_TO_MAKE_WIFI_CALLS, // bug?











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







                    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







                    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.