summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jacky Wang <jiannan@google.com> 2024-09-24 17:56:04 +0800
committer Jacky Wang <jiannan@google.com> 2024-09-24 17:59:05 +0800
commit51d27b2d5f93020bb4e95b6912f932b7485864d8 (patch)
tree9a4536e717eb908f1f9b9f39d164d2c0288e13d0
parent414670607064ce6bafad69b5cfeb7ba8664c10c8 (diff)
Overload DeviceInfoUtils.getSecurityPatch method
Bug: 365886251 Flag: EXEMPT Code refactor Test: N/A Change-Id: Idaef7f9b603e531b896057c1e76b0dc4927c9b81
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java b/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java
index ff00fb3282b1..c634216c2589 100644
--- a/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java
@@ -33,6 +33,8 @@ import android.text.TextUtils;
import android.text.format.DateFormat;
import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import java.io.BufferedReader;
@@ -153,13 +155,19 @@ public class DeviceInfoUtils {
return null;
}
- public static String getSecurityPatch() {
+ /** Returns security patch in default locale. */
+ public static @Nullable String getSecurityPatch() {
+ return getSecurityPatch(Locale.getDefault());
+ }
+
+ /** Returns security patch in given locale. */
+ public static @Nullable String getSecurityPatch(@NonNull Locale locale) {
String patch = Build.VERSION.SECURITY_PATCH;
if (!"".equals(patch)) {
try {
SimpleDateFormat template = new SimpleDateFormat("yyyy-MM-dd");
Date patchDate = template.parse(patch);
- String format = DateFormat.getBestDateTimePattern(Locale.getDefault(), "dMMMMyyyy");
+ String format = DateFormat.getBestDateTimePattern(locale, "dMMMMyyyy");
patch = DateFormat.format(format, patchDate).toString();
} catch (ParseException e) {
// broken parse; fall through and use the raw string