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

Commit 3ebabb50 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Always use local timezone for parsing date" into qt-qpr1-dev am: 1284d9de 

Change-Id: I949816a65e74fb6b9772906146684db8e4eb1dcd
parents fd355795 1284d9de

src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ public class MainlineModuleVersionPreferenceController extends BasePreferenceCon 
            try {

                final SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern,

                        Locale.getDefault());

                simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));

                simpleDateFormat.setTimeZone(TimeZone.getDefault());

                return Optional.of(simpleDateFormat.parse(text));

            } catch (ParseException e) {

                // ignore and try next pattern