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

Commit 60f57daa authored by Fan Zhang's avatar Fan Zhang
Browse files

Use hardcoded locale to do toUpperCase to parse ClockStyle.

Bug: 23829228
Change-Id: I5ded3c355ca571c8afcbe7d765df0ca8bc437614
parent 14ca4235
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.deskclock.data.DataModel.ClockStyle;
import com.android.deskclock.settings.ScreensaverSettingsActivity;
import com.android.deskclock.settings.SettingsActivity;

import java.util.Locale;
import java.util.TimeZone;

/**
@@ -127,7 +128,9 @@ final class SettingsDAO {
        final String defaultStyle = context.getString(R.string.default_clock_style);
        final SharedPreferences prefs = getSharedPreferences(context);
        final String clockStyle = prefs.getString(prefKey, defaultStyle);
        return ClockStyle.valueOf(clockStyle.toUpperCase());
        // Use hardcoded locale to perform toUpperCase, because in some languages toUpperCase adds
        // accent to character, which breaks the enum conversion.
        return ClockStyle.valueOf(clockStyle.toUpperCase(Locale.US));
    }

    private static SharedPreferences getSharedPreferences(Context context) {