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

Commit 8631e19d authored by Neil Fuller's avatar Neil Fuller Committed by Gerrit Code Review
Browse files

Merge "Correctly handle when the user has no explicit time_12_24 setting"

parents e9514808 c66ec40d

core/java/android/app/ActivityThread.java

+8 −1
Original line number Diff line number Diff line
@@ -5149,7 +5149,14 @@ public final class ActivityThread { 
        }

        updateDefaultDensity();



        final boolean is24Hr = "24".equals(mCoreSettings.getString(Settings.System.TIME_12_24));

        final String use24HourSetting = mCoreSettings.getString(Settings.System.TIME_12_24);

        Boolean is24Hr = null;

        if (use24HourSetting != null) {

            is24Hr = "24".equals(use24HourSetting) ? Boolean.TRUE : Boolean.FALSE;

        }

        // null : use locale default for 12/24 hour formatting,

        // false : use 12 hour format,

        // true : use 24 hour format.

        DateFormat.set24HourTimePref(is24Hr);



        View.mDebugViewAttributes =