From be895aea4c63bb5297ce8eacffd8d6a359ad4b62 Mon Sep 17 00:00:00 2001 From: Tsung-Mao Fang Date: Tue, 3 Dec 2019 16:57:00 +0800 Subject: [PATCH] Always use local timezone for parsing date Use local time zone to be in line with entry in phonesky mainline module. Test: Rebuild Bug: 143357811 Change-Id: I1ecf57ec7952cff580af932e58c453622d4536f0 --- .../MainlineModuleVersionPreferenceController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java index fd54f19b819..95f3ae3ca59 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java @@ -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