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

Commit 9509bcab authored Nov 20, 2020 by Songchun Fan

[SettingsProvider] allow null values in validators

As discussed in b/165943447, null is an important indicator that a
sepecific Settings element is unset, and should be treated as valid
values that can be backed up.

We should remove the non-null restriction for most of the validators,
especially because SettingsBackupAgent already can handle null values.

BUG: 170131663
Test: atest SettingsValidatorsTest
Test: atest SettingsBackupAgentTest
Change-Id: Ie44a6de503d83716c63be5c8e7937f8c9eb928bc

parent 4a14b48d

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,6 @@ public final class DiscreteValueValidator implements Validator {

		@Override
		public boolean validate(@Nullable String value) {
		return ArrayUtils.contains(mValues, value);
		return value == null \|\| ArrayUtils.contains(mValues, value);
		}
		}

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -34,10 +34,6 @@ import java.util.Map;
		* Validators for Global settings
		*/
		public class GlobalSettingsValidators {
		/**
		* All settings in {@link Global.SETTINGS_TO_BACKUP} array must have a non-null validator,
		* otherwise they won't be restored.
		*/
		public static final Map<String, Validator> VALIDATORS = new ArrayMap<>();

		static {

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,9 @@ final class InclusiveFloatRangeValidator implements Validator {

		@Override
		public boolean validate(@Nullable String value) {
		if (value == null) {
		return true;
		}
		try {
		final float floatValue = Float.parseFloat(value);
		return floatValue >= mMin && floatValue <= mMax;

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,9 @@ final class InclusiveIntegerRangeValidator implements Validator {

		@Override
		public boolean validate(@Nullable String value) {
		if (value == null) {
		return true;
		}
		try {
		final int intValue = Integer.parseInt(value);
		return intValue >= mMin && intValue <= mMax;

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -42,11 +42,6 @@ import java.util.Map;
		* Validators for the Secure Settings.
		*/
		public class SecureSettingsValidators {
		/**
		* All settings in {@link Secure.SETTINGS_TO_BACKUP} and {@link
		* DeviceSpecificSettings.DEVICE_SPECIFIC_SETTINGS_TO_BACKUP} array must have a non-null
		* validator, otherwise they won't be restored.
		*/
		public static final Map<String, Validator> VALIDATORS = new ArrayMap<>();

		static {