From 2152abbe63f712b4367f09351246a525d9b34424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Wilczy=C5=84ski?= <wilczynskip@google.com>
Date: Thu, 8 Sep 2022 17:51:02 +0000
Subject: [PATCH] Do not back up brightness values - auto-brightness adjustment
 - deprecated VR brightness

Bug: 242319543
Test: atest SettingsBackupTest
Test: atest SettingsBackupAgentTest
Change-Id: I77189d4b201a28bcb2f950a0fd6ef94d21f49464
Merged-In: I77189d4b201a28bcb2f950a0fd6ef94d21f49464
---
 .../src/android/provider/settings/backup/SystemSettings.java    | 2 --
 .../test/src/android/provider/SettingsBackupTest.java           | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java
index a6bfc408be7e6..76cee7bacd852 100644
--- a/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java
+++ b/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java
@@ -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,
diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
index 8e82b8b5219a8..8b9d1180d2ea2 100644
--- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
+++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
@@ -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
                     );