Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5cf5af4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix the date format alignment problem" into main

parents 623627d7 b839b6f8

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

+2 −2
Original line number Diff line number Diff line
@@ -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) {