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

Commit 1731d9fd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not back up brightness values - auto-brightness adjustment -... 

Merge "Do not back up brightness values - auto-brightness adjustment - deprecated VR brightness" into tm-qpr-dev am: c5c15a09

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



Change-Id: Ie4fa411e3d0e3108c64b5fff7486fabe8187b608
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13d38a73 c5c15a09

packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java

+0 −2
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ public class SystemSettings { 
        Settings.System.DIM_SCREEN,

        Settings.System.SCREEN_OFF_TIMEOUT,

        Settings.System.SCREEN_BRIGHTNESS_MODE,

        Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ,

        Settings.System.SCREEN_BRIGHTNESS_FOR_VR,

        Settings.System.ADAPTIVE_SLEEP,             // moved to secure

        Settings.System.APPLY_RAMPING_RINGER,

        Settings.System.VIBRATE_INPUT_DEVICES,

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+2 −0
Original line number Diff line number Diff line
@@ -102,7 +102,9 @@ public class SettingsBackupTest { 
                    Settings.System.MIN_REFRESH_RATE, // depends on hardware capabilities

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

                    Settings.System.SCREEN_BRIGHTNESS_FLOAT,

                    Settings.System.SCREEN_BRIGHTNESS_FOR_VR,

                    Settings.System.SCREEN_BRIGHTNESS_FOR_VR_FLOAT,

                    Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ,

                    Settings.System.MULTI_AUDIO_FOCUS_ENABLED, // form-factor/OEM specific

                    Settings.System.WEAR_ACCESSIBILITY_GESTURE_ENABLED

                    );