diff options
| author | Bill Yi <byi@google.com> | 2021-02-03 17:01:38 -0800 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2021-02-03 17:01:38 -0800 |
| commit | 46b48bcc662bc5254a16341728cbaf61b8dfd964 (patch) | |
| tree | 8a935a19cb3fd53b207d2718462c363b608734c3 /packages/SettingsProvider/src | |
| parent | 8cb6d95803f49bf8c8924aed9cb11894a740ce0c (diff) | |
| parent | f1563010352f32301e8af75c5479b81ef5b90aa7 (diff) | |
Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE
Merged-In: Icbc3c9f8e1ac8064e2e006587b4d4870d74cee2d
Merged-In: I2cb57c40fd5679dbd710396f3c69deafbac9d1c3
Change-Id: Ibfd6d85bda975aaa274be9e98e197de048d178ac
Diffstat (limited to 'packages/SettingsProvider/src')
| -rw-r--r-- | packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java index c5d4fa9f1b40..cb610fc61142 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java @@ -89,15 +89,7 @@ public class SystemSettingsValidators { return value == null || value.length() < MAX_LENGTH; } }); - VALIDATORS.put( - System.FONT_SCALE, - value -> { - try { - return Float.parseFloat(value) >= 0; - } catch (NumberFormatException | NullPointerException e) { - return false; - } - }); + VALIDATORS.put(System.FONT_SCALE, new InclusiveFloatRangeValidator(0.85f, 1.3f)); VALIDATORS.put(System.DIM_SCREEN, BOOLEAN_VALIDATOR); VALIDATORS.put( System.DISPLAY_COLOR_MODE, |