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

Commit a88ba587 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 

am: bdb8b5ef

Change-Id: I26a0dd8a3f7693f008b5fb35d78dc41ceb333031
parents 1db2e8e4 bdb8b5ef

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();