commit 04fd67cb8ef02fb006aea9aeaa7bf9fe28da5226
author Alan Viverette <alanv@google.com> Tue Apr 12 10:54:04 2016 -0400
committer Alan Viverette <alanv@google.com> Tue Apr 12 10:54:04 2016 -0400
tree 67d447dc1fd7a061407334a9d2e3929e908cf455
parent 68b19f2778989c3f4ae9eb2407f40c97e11fb57d

Default font scale is 1 if not otherwise specified

Prevents the previous user's font scale from being used as the default.

Bug: 27187556
Change-Id: I51a66ddf2d6272bd74d433158db1c8cc54b45b6d

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 638be51..fdb1cef 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -1581,6 +1581,8 @@
     public static final class System extends NameValueTable {
         public static final String SYS_PROP_SETTING_VERSION = "sys.settings_system_version";
 
+        private static final float DEFAULT_FONT_SCALE = 1.0f;
+
         /** @hide */
         public static interface Validator {
             public boolean validate(String value);
@@ -2089,9 +2091,9 @@
         public static void getConfigurationForUser(ContentResolver cr, Configuration outConfig,
                 int userHandle) {
             outConfig.fontScale = Settings.System.getFloatForUser(
-                cr, FONT_SCALE, outConfig.fontScale, userHandle);
+                    cr, FONT_SCALE, DEFAULT_FONT_SCALE, userHandle);
             if (outConfig.fontScale < 0) {
-                outConfig.fontScale = 1;
+                outConfig.fontScale = DEFAULT_FONT_SCALE;
             }
             outConfig.setLocales(LocaleList.forLanguageTags(
                     Settings.System.getStringForUser(cr, SYSTEM_LOCALES, userHandle)));