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

Commit 28d5a8f8 authored by Vlad Popa's avatar Vlad Popa
Browse files

Backup and restore audio device inventory settings 

Test: https://developer.android.com/guide/topics/data/testingbackup#TestingTransfer
Bug: 328586289
Change-Id: I0d2667837ac7d6ea99a83ce95c99d8fe7eb2a7d0
parent c6782323

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

+2 −1
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ public class SecureSettings { 
        Settings.Secure.STYLUS_POINTER_ICON_ENABLED,

        Settings.Secure.CAMERA_EXTENSIONS_FALLBACK,

        Settings.Secure.VISUAL_QUERY_ACCESSIBILITY_DETECTION_ENABLED,

        Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS

        Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS,

        Settings.Secure.AUDIO_DEVICE_INVENTORY

    };

}

packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java

+1 −0
Original line number Diff line number Diff line
@@ -424,5 +424,6 @@ public class SecureSettingsValidators { 
        VALIDATORS.put(Secure.STYLUS_POINTER_ICON_ENABLED, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Secure.CAMERA_EXTENSIONS_FALLBACK, BOOLEAN_VALIDATOR);

        VALIDATORS.put(Secure.IMMERSIVE_MODE_CONFIRMATIONS, ANY_STRING_VALIDATOR);

        VALIDATORS.put(Secure.AUDIO_DEVICE_INVENTORY, ANY_STRING_VALIDATOR);

    }

}

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

+0 −1
Original line number Diff line number Diff line
@@ -670,7 +670,6 @@ public class SettingsBackupTest { 
                 Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,

                 Settings.Secure.AUTOMATIC_STORAGE_MANAGER_LAST_RUN,

                 Settings.Secure.AUTOMATIC_STORAGE_MANAGER_TURNED_OFF_BY_POLICY,

                 Settings.Secure.AUDIO_DEVICE_INVENTORY, // not controllable by user

                 Settings.Secure.AUDIO_SAFE_CSD_AS_A_FEATURE_ENABLED, // not controllable by user

                 Settings.Secure.BACKUP_AUTO_RESTORE,

                 Settings.Secure.BACKUP_ENABLED,