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

Add new key EARLY_UPDATE_STATUS to Settings Provider

Browse Source 
DD: go/wear-dd-early-updates

This CL pulls in changes from ag/16838775 and ag/17944526
for frameworks/base project.
Bug: 228080209
Bug: 217656696

Change-Id: Ia492c12798404d6d8abc8139f738d6d77bf3cb61
(cherry picked from commit eb7f8c41496eb30a22b1c9d256adf8602a9d1f92)
This commit is contained in:
Harshad Dhabu
2022-02-11 01:28:36 +00:00
parent 4c1a20e1e2
commit 53740204b2
3 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/java/android/provider/Settings.java
View File

@@ -17755,6 +17755,37 @@ public final class Settings {
* @hide
*/
public static final String CHARGING_SOUNDS_ENABLED = "wear_charging_sounds_enabled";
/** The status of the early updates process.
* @hide
*/
public static final String EARLY_UPDATES_STATUS = "early_updates_status";
/**
* Early updates not started
* @hide
*/
public static final int EARLY_UPDATES_STATUS_NOT_STARTED = 0;
/**
* Early updates started and in progress
* @hide
*/
public static final int EARLY_UPDATES_STATUS_STARTED = 1;
/**
* Early updates completed and was successful
* @hide
*/
public static final int EARLY_UPDATES_STATUS_SUCCESS = 2;
/**
* Early updates skipped
* @hide
*/
public static final int EARLY_UPDATES_STATUS_SKIPPED = 3;
/**
* Early updates aborted due to timeout
* @hide
*/
public static final int EARLY_UPDATES_STATUS_ABORTED = 4;
}
}

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

@@ -339,6 +339,16 @@ public class GlobalSettingsValidators {
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(
new String[] {
String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_NOT_STARTED),
String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_STARTED),
String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_SUCCESS),
String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_SKIPPED),
String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_ABORTED),
}));
}
}

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

@@ -656,7 +656,8 @@ 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.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MAX_RESET_COUNT,
Settings.Global.Wearable.EARLY_UPDATES_STATUS);
private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =
newHashSet(