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

Commit 032c7a0a authored by Tianjie Xu's avatar Tianjie Xu Committed by Gerrit Code Review
Browse files

Merge "improve the format of locale argument when calling recovery"

parents a0360e38 38715228

core/java/android/os/RecoverySystem.java

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



            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";



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



        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";



        String command = filenameArg + localeArg;
@@ -646,7 +646,7 @@ public class RecoverySystem { 
            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);

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

        }



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

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

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

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


        final String filename = packageFile.getCanonicalPath();

        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);

    }