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

Commit c423d000 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

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

Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d am: 98f03f49 am: ef34053f
am: 9103632f

Change-Id: I3b2b8355d80dca87a09ef97027753bcd568cff14
parents 5ddd7172 9103632f

core/java/android/app/ActivityThread.java

+8 −1
Original line number Diff line number Diff line
@@ -5242,7 +5242,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 =