commit 1284d9de679a1f14ac82144e09f9765a9a8d4a01
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Dec 05 02:49:13 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 05 02:49:13 2019 +0000
tree 51511d19c77cf6c8e521fe3799eb1081f086a20c
parent f4bc80c45cd5318c18087cf2639368365993f4f1
parent be895aea4c63bb5297ce8eacffd8d6a359ad4b62

Merge "Always use local timezone for parsing date" into qt-qpr1-dev

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

diff --git a/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java
index fd54f19..95f3ae3 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java
@@ -111,7 +111,7 @@
             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