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

Commit c0cbf685 authored by Josh Yang's avatar Josh Yang
Browse files

Remove unused setting WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MAX_RESET_COUNT 

This setting is replaced by device config flag. So it's no longer
needed.

Bug: 196111331
Test: device build successful
Change-Id: I7d4fc7d8666281cdef9438dd2df406428806b767
parent e830c6b5

core/java/android/provider/Settings.java

+1 −8
Original line number Diff line number Diff line
@@ -17687,14 +17687,6 @@ public final class Settings { 
            public static final String WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER =

                    "wear_activity_auto_resume_timeout_set_by_user";













            /**













             * The maximum times that we are allowed to reset the activity auto-resume timeout













             * timer.













             * @hide













             */













            public static final String WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MAX_RESET_COUNT =













                    "wear_activity_auto_resume_timeout_max_reset_count";



























            /**















             * If burn in protection is enabled.















             * @hide









@@ -17702,6 +17694,7 @@ public final class Settings {













            public static final String BURN_IN_PROTECTION_ENABLED = "burn_in_protection";





























            /**



























             * Whether the device has combined location setting enabled.















             * @hide















             */

























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



+0
−3






























Original line number
Diff line number
Diff line








@@ -336,9 +336,6 @@ public class GlobalSettingsValidators {













        VALIDATORS.put(Global.Wearable.SCREEN_UNLOCK_SOUND_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Global.Wearable.CHARGING_SOUNDS_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Global.Wearable.BEDTIME_MODE, BOOLEAN_VALIDATOR);













        VALIDATORS.put(













                Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MAX_RESET_COUNT,













                NON_NEGATIVE_INTEGER_VALIDATOR);















        VALIDATORS.put(















                Global.Wearable.EARLY_UPDATES_STATUS,















                new DiscreteValueValidator(

































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



+0
−1






























Original line number
Diff line number
Diff line








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













                    Settings.Global.Wearable.CHARGING_SOUNDS_ENABLED,















                    Settings.Global.Wearable.SCREEN_UNLOCK_SOUND_ENABLED,















                    Settings.Global.Wearable.BEDTIME_MODE,













                    Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MAX_RESET_COUNT,















                    Settings.Global.Wearable.EARLY_UPDATES_STATUS);































    private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =