From b839b6f81aa2c8ba380656cffcb5f084fc3c8e3b Mon Sep 17 00:00:00 2001
From: Sunny Shao <sunnyshao@google.com>
Date: Fri, 12 Apr 2024 08:21:03 +0800
Subject: [PATCH] Fix the date format alignment problem

- The date format is different between "Android security update"
  and "Google Play system update" for locale TH.
- Use the same getBestDateTimePattern API to align the format.

Fixes: 331897617
Test: atest MainlineModuleVersionPreferenceControllerTest
Change-Id: I346749594b05703b601d0d84fd7659fd3c2fa85a
---
 .../MainlineModuleVersionPreferenceController.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java
index fa71c346562..4c02feb044f 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/MainlineModuleVersionPreferenceController.java
@@ -80,7 +80,6 @@ public class MainlineModuleVersionPreferenceController extends BasePreferenceCon
             try {
                 mModuleVersion =
                         mPackageManager.getPackageInfo(moduleProvider, 0 /* flags */).versionName;
-                return;
             } catch (PackageManager.NameNotFoundException e) {
                 Log.e(TAG, "Failed to get mainline version.", e);
                 mModuleVersion = null;
@@ -124,7 +123,8 @@ public class MainlineModuleVersionPreferenceController extends BasePreferenceCon
             return mModuleVersion;
         }
 
-        return DateFormat.getLongDateFormat(mContext).format(parsedDate.get());
+        String format = DateFormat.getBestDateTimePattern(Locale.getDefault(), "dMMMMyyyy");
+        return DateFormat.format(format, parsedDate.get());
     }
 
     private Optional<Date> parseDateFromVersionName(String text) {