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

Commit 38715228 authored by Tianjie Xu's avatar Tianjie Xu
Browse files

improve the format of locale argument when calling recovery 

Switch the locale argument from Locale.toString() to
Locale.toLanguageTag(). The new format is more readable and less error
prone.

Bug: 35215015
Test: recovery processes sr-Latn correctly

Change-Id: I47e1cf54434cb841652d4b259e0e829104fb19a2
parent 25b6f08e

core/java/android/os/RecoverySystem.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -483,7 +483,7 @@ public class RecoverySystem { 
            }

            }





            final String filenameArg = "--update_package=" + filename + "\n";

            final String filenameArg = "--update_package=" + filename + "\n";

            final String localeArg = "--locale=" + Locale.getDefault().toString() + "\n";

            final String localeArg = "--locale=" + Locale.getDefault().toLanguageTag() + "\n";

            final String securityArg = "--security\n";

            final String securityArg = "--security\n";





            String command = filenameArg + localeArg;

            String command = filenameArg + localeArg;
@@ -531,7 +531,7 @@ public class RecoverySystem { 
        }

        }





        final String filenameArg = "--update_package=" + filename + "\n";

        final String filenameArg = "--update_package=" + filename + "\n";

        final String localeArg = "--locale=" + Locale.getDefault().toString() + "\n";

        final String localeArg = "--locale=" + Locale.getDefault().toLanguageTag() + "\n";

        final String securityArg = "--security\n";

        final String securityArg = "--security\n";





        String command = filenameArg + localeArg;

        String command = filenameArg + localeArg;
@@ -646,7 +646,7 @@ public class RecoverySystem { 
            reasonArg = "--reason=" + sanitizeArg(reason);

            reasonArg = "--reason=" + sanitizeArg(reason);

        }

        }





        final String localeArg = "--locale=" + Locale.getDefault().toString();

        final String localeArg = "--locale=" + Locale.getDefault().toLanguageTag() ;

        bootCommand(context, shutdownArg, "--wipe_data", reasonArg, localeArg);

        bootCommand(context, shutdownArg, "--wipe_data", reasonArg, localeArg);

    }

    }
@@ -665,7 +665,7 @@ public class RecoverySystem { 
            reasonArg = "--reason=" + sanitizeArg(reason);

            reasonArg = "--reason=" + sanitizeArg(reason);

        }

        }





        final String localeArg = "--locale=" + Locale.getDefault().toString();

        final String localeArg = "--locale=" + Locale.getDefault().toLanguageTag() ;

        bootCommand(context, "--wipe_cache", reasonArg, localeArg);

        bootCommand(context, "--wipe_cache", reasonArg, localeArg);

    }

    }
@@ -690,7 +690,7 @@ public class RecoverySystem { 




        final String filename = packageFile.getCanonicalPath();

        final String filename = packageFile.getCanonicalPath();

        final String filenameArg = "--wipe_package=" + filename;

        final String filenameArg = "--wipe_package=" + filename;

        final String localeArg = "--locale=" + Locale.getDefault().toString();

        final String localeArg = "--locale=" + Locale.getDefault().toLanguageTag() ;

        bootCommand(context, "--wipe_ab", filenameArg, reasonArg, localeArg);

        bootCommand(context, "--wipe_ab", filenameArg, reasonArg, localeArg);

    }

    }