PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I949816a65e74fb6b9772906146684db8e4eb1dcd
This commit is contained in:
Automerger Merge Worker
2019-12-05 03:04:44 +00:00
parent fd3557954f 1284d9de67
commit 3ebabb50f3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java
View File

@@ -111,7 +111,7 @@ public class MainlineModuleVersionPreferenceController extends BasePreferenceCon
try { try {
final SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern, final SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern,
Locale.getDefault()); Locale.getDefault());
simpleDateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); simpleDateFormat.setTimeZone(TimeZone.getDefault());
return Optional.of(simpleDateFormat.parse(text)); return Optional.of(simpleDateFormat.parse(text));
} catch (ParseException e) { } catch (ParseException e) {
// ignore and try next pattern // ignore and try next pattern