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

Commit ee45a1f3 authored by Tianjie Xu's avatar Tianjie Xu Committed by android-build-merger
Browse files

Merge "improve the format of locale argument when calling recovery" am: 032c7a0a am: 1cd3a932 

am: bc0865bc

Change-Id: I65bc4945d0701ecc10fd41f827c4566dfea912f9
parents 990b9819 bc0865bc

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;
@@ -647,7 +647,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);

    }
@@ -678,7 +678,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);

    }
@@ -703,7 +703,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);

    }