Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backup ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER

Browse Source 
See b/222260820#comment27 for context.

Bug: 228159084
Test: flashed to watch, manually tested backup & restore
Change-Id: I70b5cc465f12551494cb32b20517ab19715ecf30
(cherry picked from commit 674d1559ec445bf2d4cdbd17b7894f00ab8deee6)
(cherry picked from commit 5923b2394d3c765a5d4149941a5d7c50ab16f029)
This commit is contained in:
Bagus Maulana
2022-05-06 14:33:04 +01:00
parent 14a1d201f3
commit 63b93200a2
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java
View File

@@ -93,6 +93,7 @@ public class GlobalSettings {
Settings.Global.Wearable.AMBIENT_TOUCH_TO_WAKE,
Settings.Global.Wearable.TOUCH_AND_HOLD_WATCH_FACE,
Settings.Global.Wearable.BATTERY_SAVER_MODE,
Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS
Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS,
Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER
};
}

3
packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java
View File

@@ -307,6 +307,9 @@ public class GlobalSettingsValidators {
VALIDATORS.put(
Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS,
NON_NEGATIVE_INTEGER_VALIDATOR);
VALIDATORS.put(
Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER,
BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.Wearable.BURN_IN_PROTECTION_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.Wearable.COMBINED_LOCATION_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Global.Wearable.WRIST_ORIENTATION_MODE,

1
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -652,7 +652,6 @@ public class SettingsBackupTest {
Settings.Global.Wearable.CLOCKWORK_SYSUI_PACKAGE,
Settings.Global.Wearable.CLOCKWORK_SYSUI_MAIN_ACTIVITY,
Settings.Global.Wearable.CLOCKWORK_LONG_PRESS_TO_ASSISTANT_ENABLED,
Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER,
Settings.Global.Wearable.WET_MODE_ON,
Settings.Global.Wearable.COOLDOWN_MODE_ON,
Settings.Global.Wearable.CHARGING_SOUNDS_ENABLED,