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

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

Merge "Avoid hidden DataFormat.is24Hour field access" am: 4d9823f3 

am: 64106e43

Change-Id: Ibf5b2fb27842fb2333fb8271f5cd6fe69c6963d1
parents 8f842fae 64106e43

core/tests/coretests/src/android/text/format/DateUtilsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public class DateUtilsTest { 
    @Test

    public void testFormatSameDayTime() {

        // This test assumes a default DateFormat.is24Hour setting.

        DateFormat.is24Hour = null;

        DateFormat.set24HourTimePref(null);

        Date date = new Date(109, 0, 19, 3, 30, 15);

        long fixedTime = date.getTime();