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

Commit a6976a32 authored by Edgar Wang's avatar Edgar Wang
Browse files

Remove aware sensor related features from backup list 

Bug: 141793411
Test: atest & manual
Change-Id: Ifed4ebb5f5a2ebff0420b3ff1ab1e9a533829566
parent 25e071c7

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

+0 −5
Original line number Diff line number Diff line
@@ -100,8 +100,6 @@ public class SecureSettings { 
        Settings.Secure.DOZE_PICK_UP_GESTURE,

        Settings.Secure.DOZE_DOUBLE_TAP_GESTURE,

        Settings.Secure.DOZE_TAP_SCREEN_GESTURE,

        Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE,

        Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE,

        Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT,

        Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,

        Settings.Secure.FACE_UNLOCK_KEYGUARD_ENABLED,
@@ -144,12 +142,9 @@ public class SecureSettings { 
        Settings.Secure.TRUST_AGENTS_EXTEND_UNLOCK,

        Settings.Secure.UI_NIGHT_MODE,

        Settings.Secure.LOCK_SCREEN_WHEN_TRUST_LOST,

        Settings.Secure.SKIP_GESTURE,

        Settings.Secure.SKIP_DIRECTION,

        Settings.Secure.SILENCE_GESTURE,

        Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES,

        Settings.Secure.NAVIGATION_MODE,

        Settings.Secure.AWARE_ENABLED,

        Settings.Secure.SKIP_GESTURE_COUNT,

        Settings.Secure.SKIP_TOUCH_COUNT,

        Settings.Secure.SILENCE_ALARMS_GESTURE_COUNT,

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

+5 −0
Original line number Diff line number Diff line
@@ -720,6 +720,11 @@ public class SettingsBackupTest { 
                 Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED,

                 Settings.Secure.FACE_UNLOCK_DIVERSITY_REQUIRED,

                 Settings.Secure.MANAGED_PROVISIONING_DPC_DOWNLOADED,

                 Settings.Secure.AWARE_ENABLED,

                 Settings.Secure.SKIP_GESTURE,

                 Settings.Secure.SILENCE_GESTURE,

                 Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE,

                 Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE,

                 Settings.Secure.FACE_UNLOCK_RE_ENROLL);



    @Test